[varnish] retag 6.6

[gquintard]

sorry, I missed a tag in #9836, does it mean it will have stolen the 6.5 tag from the legitimate image?

[TimWolla]

does it mean it will have stolen the 6.5 tag from the legitimate image?

Yes, it does. varnish:6.5 currently is equivalent to 6.6. The maintainers will need to comment on the best course of action here.

[timwolla@~]docker pull varnish:6.5
6.5: Pulling from library/varnish
6f28985ad184: Pull complete 
05740eb791f9: Pull complete 
7f4ad7f3b793: Pull complete 
Digest: sha256:8cf38287c290c9d68300b5b396c6a8db796a55a5fdb8a912dfab5eae709c854f
Status: Downloaded newer image for varnish:6.5
docker.io/library/varnish:6.5
[timwolla@~]docker pull varnish:6.6
6.6: Pulling from library/varnish
Digest: sha256:8cf38287c290c9d68300b5b396c6a8db796a55a5fdb8a912dfab5eae709c854f
Status: Downloaded newer image for varnish:6.6
docker.io/library/varnish:6.6

[tianon]

Doh, yep; sorry we missed this. I'd suggest adding something like the following temporarily to restore that tag (which can be removed again once it's rebuilt/pushed successfully):

Tags: 6.5
Directory: fresh/debian
GitCommit: f26947e3a1d7ab5e3e76114d58e54f0ddee13534

[gquintard]

@tianon, ah right, that's easy, I just force-pushed that

[github-actions]

Diff for e9f9aaa:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3f93881..49e9f1a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -5,6 +5,10 @@ Tags: 6.0, 6.0.7-1, 6.0.7, stable
 GitCommit: c0846f15b04cd499a1df1fb62f0693b41a84e636
 Directory: stable/debian
 
-Tags: 6.5, 6.6.0-1, 6.6.0, 6.6, 6, latest, fresh
+Tags: 6.5, 6.5.1-1, 6.5.1
+GitCommit: f26947e3a1d7ab5e3e76114d58e54f0ddee13534
+Directory: fresh/debian
+
+Tags: 6.6, 6.6.0-1, 6.6.0, 6, latest, fresh
 GitCommit: 702cb88b01771ff6940b865f0a1f86e98bc41b0a
 Directory: fresh/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index b0d654b..e780b68 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,6 +3,8 @@ varnish:6.0
 varnish:6.0.7
 varnish:6.0.7-1
 varnish:6.5
+varnish:6.5.1
+varnish:6.5.1-1
 varnish:6.6
 varnish:6.6.0
 varnish:6.6.0-1
diff --git a/varnish_fresh/Dockerfile b/varnish_6.5.1/Dockerfile
similarity index 85%
copy from varnish_fresh/Dockerfile
copy to varnish_6.5.1/Dockerfile
index 261eb14..3675194 100644
--- a/varnish_fresh/Dockerfile
+++ b/varnish_6.5.1/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV VARNISH_VERSION 6.6.0-1~buster
+ENV VARNISH_VERSION 6.5.1~buster-1
 ENV VARNISH_SIZE 100M
 
 RUN set -ex; \
@@ -10,13 +10,13 @@ RUN set -ex; \
 	"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends apt-transport-https ca-certificates $fetchDeps; \
-	key=A0378A38E4EACA3660789E570BAC19E3F6C90CD5; \
+	key=A487F9BE81D9DF5121488CFE1C7B4E9FF149D65B; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys $key; \
 	gpg --batch --export export $key > /etc/apt/trusted.gpg.d/varnish.gpg; \
 	gpgconf --kill all; \
 	rm -rf $GNUPGHOME; \
-	echo deb https://packagecloud.io/varnishcache/varnish66/debian/ buster main > /etc/apt/sources.list.d/varnish.list; \
+	echo deb https://packagecloud.io/varnishcache/varnish65/debian/ buster main > /etc/apt/sources.list.d/varnish.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends varnish=$VARNISH_VERSION; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
diff --git a/varnish_fresh/docker-varnish-entrypoint b/varnish_6.5.1/docker-varnish-entrypoint
similarity index 100%
copy from varnish_fresh/docker-varnish-entrypoint
copy to varnish_6.5.1/docker-varnish-entrypoint