Browse Source

[mod] add Ubuntu 20.10 image to the LXC suite

Ubuntu 20.10 image [1] is avialable from https://images.linuxcontainers.org

BTW: replace builhost package 'ttf-dejavu' by more common meta package
'fonts-dejavu' ('ttf-dejavu' is no longer available in 20.10).

[1] https://github.com/lxc/lxc-ci/commit/d161de601bffe4055d77b9d52a826ce5d81567d9

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 4 years ago
parent
commit
89e6ba5af7
3 changed files with 4 additions and 1 deletions
  1. 1 0
      utils/lxc-searx.env
  2. 2 0
      utils/lxc.sh
  3. 1 1
      utils/searx.sh

+ 1 - 0
utils/lxc-searx.env

@@ -24,6 +24,7 @@ lxc_set_suite_env() {
         "$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
 
         # EOL see https://fedoraproject.org/wiki/Releases
         "$LINUXCONTAINERS_ORG_NAME:fedora/31"     "fedora31"

+ 2 - 0
utils/lxc.sh

@@ -39,6 +39,8 @@ $ubu1904_boilerplate
 echo 'Set disable_coredump false' >> /etc/sudo.conf
 "
 
+ubu2010_boilerplate="$ubu1904_boilerplate"
+
 # shellcheck disable=SC2034
 archlinux_boilerplate="
 pacman -Syu --noconfirm

+ 1 - 1
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