Upgrade to debian:bullseye-slim (#155)

* switch to bullseye * pin varnish to 6.0.11 * fix GoReleaser.Dockerfile * fix GoReleaser.Dockerfile
mittwald · May 24, 2023 · b24157d · b24157d
1 parent ed1135f
commit b24157d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/build/package/docker/Dockerfile b/build/package/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN         CGO_ENABLED=0 GOOS=linux \
                 -a cmd/kube-httpcache/main.go
 
 
-FROM        debian:stretch-slim AS final
+FROM        debian:bullseye-slim AS final
 
 ENV         EXPORTER_VERSION=1.6.1
 
@@ -29,14 +29,14 @@ RUN         set -x \
                 gnupg \
                 apt-transport-https \
             && \
-            curl -Ss -L https://packagecloud.io/varnishcache/varnish60lts/gpgkey | apt-key add - \
+            curl -fsSL https://packagecloud.io/varnishcache/varnish60lts/gpgkey | apt-key add - \
             && \
             printf "%s\n%s" \
-                "deb https://packagecloud.io/varnishcache/varnish60lts/debian/ stretch main" \
-                "deb-src https://packagecloud.io/varnishcache/varnish60lts/debian/ stretch main" \
+                "deb https://packagecloud.io/varnishcache/varnish60lts/debian/ bullseye main" \
+                "deb-src https://packagecloud.io/varnishcache/varnish60lts/debian/ bullseye main" \
             > "/etc/apt/sources.list.d/varnishcache_varnish60lts.list" \
             && \
-            apt-get -qq update && apt-get -qq install varnish \
+            apt-get -qq update && apt-get -qq install varnish=6.0.11-1~bullseye \
             && \
             apt-get -qq purge curl gnupg && \
             apt-get -qq autoremove && apt-get -qq autoclean && \

diff --git a/build/package/docker/GoReleaser.Dockerfile b/build/package/docker/GoReleaser.Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=
-FROM        ${ARCH}debian:stretch-slim
+FROM        ${ARCH}debian:bullseye-slim
 
 ENV         EXPORTER_VERSION=1.6.1
 
@@ -18,11 +18,11 @@ RUN         apt-get -qq update && apt-get -qq upgrade \
             curl -Ss -L https://packagecloud.io/varnishcache/varnish60lts/gpgkey | apt-key add - \
             && \
             printf "%s\n%s" \
-                "deb https://packagecloud.io/varnishcache/varnish60lts/debian/ stretch main" \
-                "deb-src https://packagecloud.io/varnishcache/varnish60lts/debian/ stretch main" \
+                "deb https://packagecloud.io/varnishcache/varnish60lts/debian/ bullseye main" \
+                "deb-src https://packagecloud.io/varnishcache/varnish60lts/debian/ bullseye main" \
             > "/etc/apt/sources.list.d/varnishcache_varnish60lts.list" \
             && \
-            apt-get -qq update && apt-get -qq install varnish \
+            apt-get -qq update && apt-get -qq install varnish=6.0.11-1~bullseye \
             && \
             apt-get -qq purge curl gnupg apt-transport-https && \
             apt-get -qq autoremove && apt-get -qq autoclean && \