Browse Source

Merge pull request #2619 from return42/drop-ubu1604

[mod] Drop Ubuntu 16.04 (Xenial Xerus) support
Alexandre Flament 4 years ago
parent
commit
d26261c5ab
2 changed files with 1 additions and 3 deletions
  1. 0 1
      utils/lxc-searx.env
  2. 1 2
      utils/lxc.sh

+ 0 - 1
utils/lxc-searx.env

@@ -21,7 +21,6 @@ lxc_set_suite_env() {
         # to disable containers, comment out lines ..
 
         # 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/20.04"  "ubu2004" # April 2025
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10"  "ubu2010" # July 2021

+ 1 - 2
utils/lxc.sh

@@ -24,13 +24,12 @@ LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
 LXC_SHARE_FOLDER="/share"
 LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"
 
-ubu1604_boilerplate="
+ubu1804_boilerplate="
 export DEBIAN_FRONTEND=noninteractive
 apt-get update -y
 apt-get upgrade -y
 apt-get install -y git curl wget
 "
-ubu1804_boilerplate="$ubu1604_boilerplate"
 ubu1904_boilerplate="$ubu1804_boilerplate"
 
 # shellcheck disable=SC2034