Merge pull request #2435 from return42/fix-lxc-env

[LXC] replace ubu1910 image by ubu2010 image

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]}"

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"

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

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