Merge pull request #2148 from return42/lxc-ubu2204

[LXC] ubuntu 21.10 upgrade to ubuntu 22.04 LTS
This commit is contained in:
Markus Heiser 2023-02-01 10:06:48 +01:00 committed by GitHub
commit d9ab83642f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions

View file

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

View file

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