From 8fbe4ef0e4b8a48677831e01503ed437d9211178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Fri, 10 Feb 2023 19:34:52 +0100 Subject: [PATCH 1/2] add debian 2023 keys --- docker/linux-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 225c820b8..9ffd90010 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -201,7 +201,7 @@ main() { curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{7.0,8,9,10,11}.asc' -O curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{8,9,10,11}-security.asc' -O curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/release-{7,8,9,10,11}.asc' -O - curl --retry 3 -sSfL 'https://www.ports.debian.org/archive_{2020,2021,2022}.key' -O + curl --retry 3 -sSfL 'https://www.ports.debian.org/archive_{2020,2021,2022,2023}.key' -O for key in *.asc *.key; do apt-key add "${key}" From ace233c5ed65aec20646ef36327dc0e74422d3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Fri, 10 Feb 2023 22:34:46 +0100 Subject: [PATCH 2/2] allow insecure repositories, also cleanup --- docker/linux-image.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 9ffd90010..b270d1891 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -115,6 +115,7 @@ main() { # archive.debian.org Release files are expired. echo "Acquire::Check-Valid-Until false;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid + echo "Acquire::AllowInsecureRepositories True;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid dropbear="dropbear" deps=(libcrypt1:"${arch}") @@ -398,6 +399,9 @@ EOF if [ -f /etc/dpkg/dpkg.cfg.d/multiarch.bak ]; then mv /etc/dpkg/dpkg.cfg.d/multiarch.bak /etc/dpkg/dpkg.cfg.d/multiarch fi + if [ -f /etc/apt/apt.conf.d/10-nocheckvalid ]; then + rm /etc/apt/apt.conf.d/10-nocheckvalid + fi # can fail if arch is used (image arch, such as amd64 and/or i386) dpkg --remove-architecture "${arch}" || true apt-get update