Browse Source

Merge pull request #2148 from return42/lxc-ubu2204

[LXC] ubuntu 21.10 upgrade to ubuntu 22.04 LTS
Markus Heiser 2 years ago
parent
commit
d9ab83642f
2 changed files with 5 additions and 10 deletions
  1. 2 2
      utils/lxc-searxng.env
  2. 3 8
      utils/lxc.sh

+ 2 - 2
utils/lxc-searxng.env

@@ -16,8 +16,8 @@ lxc_set_suite_env() {
     export LXC_SUITE=(
 
         # end of standard support see https://wiki.ubuntu.com/Releases
-        "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04"  "ubu2004" # April 2025
-        "$LINUXCONTAINERS_ORG_NAME:ubuntu/21.10"  "ubu2110" # July 2027
+        "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04"  "ubu2004" # LTS EOSS April 2025
+        "$LINUXCONTAINERS_ORG_NAME:ubuntu/22.04"  "ubu2204" # LTS EOSS April 2027
 
         # EOL see https://fedoraproject.org/wiki/Releases
         "$LINUXCONTAINERS_ORG_NAME:fedora/35"     "fedora35"

+ 3 - 8
utils/lxc.sh

@@ -25,22 +25,17 @@ LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
 LXC_SHARE_FOLDER="/share"
 LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"
 
-ubu1804_boilerplate="
+# shellcheck disable=SC2034
+ubu2004_boilerplate="
 export DEBIAN_FRONTEND=noninteractive
 apt-get update -y
 apt-get upgrade -y
 apt-get install -y git curl wget
-"
-ubu1904_boilerplate="$ubu1804_boilerplate"
-
-# shellcheck disable=SC2034
-ubu2004_boilerplate="
-$ubu1904_boilerplate
 echo 'Set disable_coredump false' >> /etc/sudo.conf
 "
 
 # shellcheck disable=SC2034
-ubu2110_boilerplate="$ubu1904_boilerplate"
+ubu2204_boilerplate="$ubu2004_boilerplate"
 
 # shellcheck disable=SC2034
 archlinux_boilerplate="