git.iko.soy/searx
on master help sign in
Merge pull request #2435 from return42/fix-lxc-env

[LXC] replace ubu1910 image by ubu2010 image

commit5b58f6a7f8a4e10b1d67286928939044fa8258dc authorAlexandre Flament <alex@al-f.net> dateTue 5 Jan 2021, 16:41 (6 years ago) parent5fb9a5c89e6ba5
4 files changed+8−7
compare with master
unifiedsplit
utils/lib.sh+2−2 utils/lxc-searx.env+2−2 utils/lxc.sh+3−2 utils/searx.sh+1−1
utils/lib.sh+2−2
@@ -1429,9 +1429,9 @@ lxc_install_base_packages() {
14291429
14301430lxc_image_copy() {
14311431
1432− # usage: lxc_copy_image <remote image> <local image>
1432+ # usage: lxc_image_copy <remote image> <local image>
14331433 #
1434− # lxc_copy_image "images:ubuntu/19.10" "ubu1910"
1434+ # lxc_image_copy "images:ubuntu/20.04" "ubu2004"
14351435
14361436 if lxc_image_exists "local:${LXC_SUITE[i+1]}"; then
14371437 info_msg "image ${LXC_SUITE[i]} already copied --> ${LXC_SUITE[i+1]}"
utils/lxc-searx.env+2−2
@@ -23,8 +23,8 @@ lxc_set_suite_env() {
2323 # end of standard support see https://wiki.ubuntu.com/Releases
2424 "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04" "ubu1604" # April 2021
2525 "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023
26− "$LINUXCONTAINERS_ORG_NAME:ubuntu/19.10" "ubu1910" # July 2020
27− "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # future (EOL 2030)
26+ "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025
27+ "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10" "ubu2010" # July 2021
2828
2929 # EOL see https://fedoraproject.org/wiki/Releases
3030 "$LINUXCONTAINERS_ORG_NAME:fedora/31" "fedora31"
utils/lxc.sh+3−2
@@ -32,14 +32,15 @@ apt-get install -y git curl wget
3232"
3333ubu1804_boilerplate="$ubu1604_boilerplate"
3434ubu1904_boilerplate="$ubu1804_boilerplate"
35−ubu1910_boilerplate="$ubu1904_boilerplate"
3635
3736# shellcheck disable=SC2034
3837ubu2004_boilerplate="
39−$ubu1910_boilerplate
38+$ubu1904_boilerplate
4039echo 'Set disable_coredump false' >> /etc/sudo.conf
4140"
4241
42+ubu2010_boilerplate="$ubu1904_boilerplate"
43+
4344# shellcheck disable=SC2034
4445archlinux_boilerplate="
4546pacman -Syu --noconfirm
utils/searx.sh+1−1
@@ -50,7 +50,7 @@ shellcheck"
5050
5151BUILD_PACKAGES_debian="\
5252firefox graphviz imagemagick texlive-xetex librsvg2-bin
53−texlive-latex-recommended texlive-extra-utils ttf-dejavu
53+texlive-latex-recommended texlive-extra-utils fonts-dejavu
5454latexmk"
5555
5656# pacman packages