Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7d92d64 authored Jan 02, 2021 by Markus Heiser

[fix] remove Ubuntu 19.10 from the LXC suite (EOL)

Official support for Ubuntu 19.10 'Eoan Ermine' ended on July 17, 2020.

The image has been dropped [1] from https://images.linuxcontainers.org

[1] https://github.com/lxc/lxc-ci/commit/d161de601bffe4055d77b9d52a826ce5d81567d9



Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

parent 5fb9a5c7

utils/lib.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -1429,9 +1429,9 @@ lxc_install_base_packages() {

		lxc_image_copy() {

		# usage: lxc_copy_image <remote image> <local image>
		# usage: lxc_image_copy <remote image> <local image>
		#
		# lxc_copy_image "images:ubuntu/19.10" "ubu1910"
		# lxc_image_copy "images:ubuntu/20.04" "ubu2004"

		if lxc_image_exists "local:${LXC_SUITE[i+1]}"; then
		info_msg "image ${LXC_SUITE[i]} already copied --> ${LXC_SUITE[i+1]}"

utils/lxc-searx.env

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,7 @@ lxc_set_suite_env() {
		# end of standard support see https://wiki.ubuntu.com/Releases
		"$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04" "ubu1604" # April 2021
		"$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023
		"$LINUXCONTAINERS_ORG_NAME:ubuntu/19.10" "ubu1910" # July 2020
		"$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # future (EOL 2030)
		"$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025

		# EOL see https://fedoraproject.org/wiki/Releases
		"$LINUXCONTAINERS_ORG_NAME:fedora/31" "fedora31"

utils/lxc.sh

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,11 +32,10 @@ apt-get install -y git curl wget
		"
		ubu1804_boilerplate="$ubu1604_boilerplate"
		ubu1904_boilerplate="$ubu1804_boilerplate"
		ubu1910_boilerplate="$ubu1904_boilerplate"

		# shellcheck disable=SC2034
		ubu2004_boilerplate="
		$ubu1910_boilerplate
		$ubu1904_boilerplate
		echo 'Set disable_coredump false' >> /etc/sudo.conf
		"