From bd5d947f1e77bab2f9d942eceb60c2e6681c416e Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Fri, 24 Jul 2020 13:19:34 -0700 Subject: [PATCH] use main mirrors for pinned packages, then try snapshots --- config/container/packages.list | 13 ++++++++----- config/container/sources.list | 4 ++++ scripts/update-packages | 6 ++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/config/container/packages.list b/config/container/packages.list index 60cecbe..fa1bfb5 100644 --- a/config/container/packages.list +++ b/config/container/packages.list @@ -196,6 +196,7 @@ isc-dhcp-common=4.4.1-2 iso-codes=4.2-1 java-common=0.71 javascript-common=11 +jq=1.5+dfsg-2+b1 jsbeautifier=1.6.4-7 junit=3.8.2-9 klibc-utils=2.0.6-1 @@ -488,6 +489,7 @@ libjetbrains-annotations-java=17.0.0-1 libjpeg-dev=1:1.5.2-2 libjpeg62-turbo:amd64=1:1.5.2-2+b1 libjpeg62-turbo-dev:amd64=1:1.5.2-2+b1 +libjq1:amd64=1.5+dfsg-2+b1 libjs-jquery=3.3.1~dfsg-3 libjs-jquery-ui=1.12.1+dfsg-5 libjson-c3:amd64=0.12.1+ds-2 @@ -580,6 +582,7 @@ libntfs-3g883=1:2017.3.23AR.3-3 libntlm0:amd64=1.5-1 libnuma1:amd64=2.0.12-1 libogg0:amd64=1.3.2-1+b1 +libonig5:amd64=6.9.1-1 libopenal-data=1:1.19.1-1 libopenal1:amd64=1:1.19.1-1 libopencore-amrnb0:amd64=0.1.3-2.1+b2 @@ -1009,11 +1012,11 @@ python3-tlsh=3.4.4+20151206-1.1 python3.7=3.7.3-2+deb10u1 python3.7-minimal=3.7.3-2+deb10u1 qdbus=4:4.8.7+dfsg-18 -qemu-system-common=1:3.1+dfsg-8+deb10u6 -qemu-system-data=1:3.1+dfsg-8+deb10u6 -qemu-system-gui=1:3.1+dfsg-8+deb10u6 -qemu-system-x86=1:3.1+dfsg-8+deb10u6 -qemu-utils=1:3.1+dfsg-8+deb10u6 +qemu-system-common=1:3.1+dfsg-8+deb10u7 +qemu-system-data=1:3.1+dfsg-8+deb10u7 +qemu-system-gui=1:3.1+dfsg-8+deb10u7 +qemu-system-x86=1:3.1+dfsg-8+deb10u7 +qemu-utils=1:3.1+dfsg-8+deb10u7 qt-at-spi:amd64=0.4.0-9 qtchooser=66-2 qtcore4-l10n=4:4.8.7+dfsg-18 diff --git a/config/container/sources.list b/config/container/sources.list index d51c295..ca36c2f 100644 --- a/config/container/sources.list +++ b/config/container/sources.list @@ -1,3 +1,7 @@ + +deb http://deb.debian.org/debian buster main deb http://snapshot.debian.org/archive/debian/20200724T000000Z buster main +deb http://security.debian.org/debian-security buster/updates main deb http://snapshot.debian.org/archive/debian-security/20200724T000000Z buster/updates main +deb http://deb.debian.org/debian buster-updates main deb http://snapshot.debian.org/archive/debian/20200724T000000Z buster-updates main diff --git a/scripts/update-packages b/scripts/update-packages index b146b7a..db7a4cb 100755 --- a/scripts/update-packages +++ b/scripts/update-packages @@ -7,9 +7,15 @@ apt upgrade -y dpkg -l | awk '{ if ($1 == "ii") print $2 "=" $3 }' > /etc/apt/packages.list + + snapshot_date=$(date -d @${GIT_EPOCH} +"%Y%m%dT000000Z") cat <<-EOF > /etc/apt/sources.list + +deb http://deb.debian.org/debian buster main deb http://snapshot.debian.org/archive/debian/${snapshot_date} buster main +deb http://security.debian.org/debian-security buster/updates main deb http://snapshot.debian.org/archive/debian-security/${snapshot_date} buster/updates main +deb http://deb.debian.org/debian buster-updates main deb http://snapshot.debian.org/archive/debian/${snapshot_date} buster-updates main EOF