Merge branch 'master' into meiji163-unthrottle-store

nilly · Nov 18, 2023 · 79cac6c · 79cac6c
2 parents c40872d + bc46ca8
commit 79cac6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -1,6 +1,11 @@
-FROM golang:1.16-buster
+FROM golang:1.16-stretch
 LABEL maintainer="github@github.com"
 
+# Update stretch repositories
+RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
+           -e 's|security.debian.org|archive.debian.org/|g' \
+           -e '/stretch-updates/d' /etc/apt/sources.list
+
 RUN useradd -m testuser
 
 RUN apt-get update

diff --git a/script/build-deploy-tarball b/script/build-deploy-tarball
@@ -31,5 +31,5 @@ cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/freno/
 ### HACK HACK HACK ###
 # blame @carlosmn, @mattr, @timvaillancourt and @rashiq
 # Allow builds on buster to also be used for focal
-focal_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-focal-/)
+focal_tarball_name=$(echo $(basename "${tarball}") | sed s/-stretch-/-focal-/)
 cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/freno/${focal_tarball_name}.gz"