diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-01-05 16:41:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 16:41:13 +0100 |
| commit | 5b58f6a7f8a4e10b1d67286928939044fa8258dc (patch) | |
| tree | 7f78726459b052743d31327e243dd9c768214bf7 | |
| parent | 5fb9a5c7c10252b21a23fe66e1625ed9f8691b4a (diff) | |
| parent | 89e6ba5af72041361acf916294fc5d13741098cc (diff) | |
Merge pull request #2435 from return42/fix-lxc-env
[LXC] replace ubu1910 image by ubu2010 image
| -rwxr-xr-x | utils/lib.sh | 4 | ||||
| -rw-r--r-- | utils/lxc-searx.env | 4 | ||||
| -rwxr-xr-x | utils/lxc.sh | 5 | ||||
| -rwxr-xr-x | utils/searx.sh | 2 |
4 files changed, 8 insertions, 7 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 <remote image> <local image> + # usage: lxc_image_copy <remote image> <local image> # - # 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..3121b63ce 100644 --- a/utils/lxc-searx.env +++ b/utils/lxc-searx.env @@ -23,8 +23,8 @@ 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 + "$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 11dbe578d..39701ef04 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -32,14 +32,15 @@ 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 " +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 |