diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2023-02-01 10:06:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 10:06:48 +0100 |
| commit | d9ab83642f3b398c36f808bd8b08dc3b482722f4 (patch) | |
| tree | 7409b24fe104c2d3f3dac6c8097bc31823b56082 /utils | |
| parent | 9d102fb08ff4a7dc04d093561adde60436e3f69e (diff) | |
| parent | c90e157ddd77e97d9be37fd1e3e0c249d60ab8d3 (diff) | |
Merge pull request #2148 from return42/lxc-ubu2204
[LXC] ubuntu 21.10 upgrade to ubuntu 22.04 LTS
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lxc-searxng.env | 4 | ||||
| -rwxr-xr-x | utils/lxc.sh | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/utils/lxc-searxng.env b/utils/lxc-searxng.env index 86279d4b3..9d6efb42e 100644 --- a/utils/lxc-searxng.env +++ b/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" diff --git a/utils/lxc.sh b/utils/lxc.sh index 0a792b4b5..28cc30265 100755 --- a/utils/lxc.sh +++ b/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=" |