From c7d92d64753334af303e7a5fcbe1b041d933ba1e Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 2 Jan 2021 17:23:18 +0100 Subject: [PATCH 1/2] [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 --- utils/lib.sh | 4 ++-- utils/lxc-searx.env | 3 +-- utils/lxc.sh | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/utils/lib.sh b/utils/lib.sh index 83dd75077..8ae6bdd44 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -1429,9 +1429,9 @@ lxc_install_base_packages() { lxc_image_copy() { - # usage: lxc_copy_image + # usage: lxc_image_copy # - # 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]}" diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env index 3ce10021b..03a4aac8c 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -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" diff --git a/utils/lxc.sh b/utils/lxc.sh index 11dbe578d..2737a188b 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -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 " From 89e6ba5af72041361acf916294fc5d13741098cc Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 2 Jan 2021 17:27:16 +0100 Subject: [PATCH 2/2] [mod] add Ubuntu 20.10 image to the LXC suite Ubuntu 20.10 image [1] is avialable from https://images.linuxcontainers.org BTW: replace builhost package 'ttf-dejavu' by more common meta package 'fonts-dejavu' ('ttf-dejavu' is no longer available in 20.10). [1] https://github.com/lxc/lxc-ci/commit/d161de601bffe4055d77b9d52a826ce5d81567d9 Signed-off-by: Markus Heiser --- utils/lxc-searx.env | 1 + utils/lxc.sh | 2 ++ utils/searx.sh | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env index 03a4aac8c..3121b63ce 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -24,6 +24,7 @@ lxc_set_suite_env() { "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04" "ubu1604" # April 2021 "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025 + "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10" "ubu2010" # July 2021 # EOL see https://fedoraproject.org/wiki/Releases "$LINUXCONTAINERS_ORG_NAME:fedora/31" "fedora31" diff --git a/utils/lxc.sh b/utils/lxc.sh index 2737a188b..39701ef04 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -39,6 +39,8 @@ $ubu1904_boilerplate echo 'Set disable_coredump false' >> /etc/sudo.conf " +ubu2010_boilerplate="$ubu1904_boilerplate" + # shellcheck disable=SC2034 archlinux_boilerplate=" pacman -Syu --noconfirm diff --git a/utils/searx.sh b/utils/searx.sh index 3a21e2225..b7d3b8e1c 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -50,7 +50,7 @@ shellcheck" BUILD_PACKAGES_debian="\ firefox graphviz imagemagick texlive-xetex librsvg2-bin -texlive-latex-recommended texlive-extra-utils ttf-dejavu +texlive-latex-recommended texlive-extra-utils fonts-dejavu latexmk" # pacman packages