diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c415ecb10d4261f5da5e690631706d6b79b8b532..200daa7686ed719b9213a151786b1ec0495ed99a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: - check variables: - TEST_IMAGE: briar/reproducer:${CI_BUILD_REF_NAME} + TEST_IMAGE: briar/reproducer:${CI_COMMIT_REF_NAME} RELEASE_IMAGE: briar/reproducer:latest TAG_IMAGE: briar/reproducer:${APP}-${RELEASE_TAG} diff --git a/install.sh b/install.sh index bde1779f9d2c594f2da37978ff951da52d666d85..0bc4fc35830444e4ce14aeaff600c66e3686e7d8 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ set -e set -x # use snapshot repos for deterministic package versions -DATE="20220208T000000Z" +DATE="20230814T000000Z" cat << EOF > /etc/apt/sources.list deb http://snapshot.debian.org/archive/debian/${DATE}/ bullseye main deb http://snapshot.debian.org/archive/debian-security/${DATE}/ bullseye-security main @@ -12,6 +12,10 @@ EOF # ignore expired package releases (they expire too fast) echo 'Acquire::Check-Valid-Until "0";' >> /etc/apt/apt.conf.d/10-ignore-expiry +# increase number of retries (default is 3), as connections to +# snapshot.debian.org often fail +echo 'Acquire::Retries "5";' >> /etc/apt/apt.conf.d/80-retries + # do not install documentation to keep image small echo "path-exclude=/usr/share/locale/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc echo "path-exclude=/usr/share/man/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc