Skip to content

[varnish] new 6.5#8797

Merged
yosifkit merged 1 commit intodocker-library:masterfrom
gquintard:master
Sep 29, 2020
Merged

[varnish] new 6.5#8797
yosifkit merged 1 commit intodocker-library:masterfrom
gquintard:master

Conversation

@gquintard
Copy link
Contributor

another 6 months, another release :-)

@github-actions
Copy link

Diff for b12ef1e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b623027..db4e8c9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,9 +2,9 @@ Maintainers: Guillaume Quintard <guillaume@varni.sh> (@gquintard)
 GitRepo: https://github.com/varnish/docker-varnish.git
 
 Tags: 6.0, 6.0.6-1, 6.0.6, stable
-GitCommit: ec71d5c65972b6fa9b2ec58ed3b131afce9f9578
+GitCommit: 2459369407fbf77df75d6948ee48de8c814fb3e4
 Directory: stable/debian
 
-Tags: 6.4, 6.4.0-1, 6.4.0, 6, latest, fresh
-GitCommit: ec71d5c65972b6fa9b2ec58ed3b131afce9f9578
+Tags: 6.5, 6.5.1-1, 6.5.1, 6, latest, fresh
+GitCommit: f26947e3a1d7ab5e3e76114d58e54f0ddee13534
 Directory: fresh/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index 1f7d311..0d95462 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,9 +2,9 @@ varnish:6
 varnish:6.0
 varnish:6.0.6
 varnish:6.0.6-1
-varnish:6.4
-varnish:6.4.0
-varnish:6.4.0-1
+varnish:6.5
+varnish:6.5.1
+varnish:6.5.1-1
 varnish:fresh
 varnish:latest
 varnish:stable
diff --git a/varnish_fresh/Dockerfile b/varnish_fresh/Dockerfile
index 5213efd..3675194 100644
--- a/varnish_fresh/Dockerfile
+++ b/varnish_fresh/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim
 
-ENV VARNISH_VERSION 6.4.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=A9897320C397E3A60C03E8BF821AD320F71BFF3D; \
+	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/varnish64/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_fresh/docker-varnish-entrypoint
index e1f02c8..54efa98 100755
--- a/varnish_fresh/docker-varnish-entrypoint
+++ b/varnish_fresh/docker-varnish-entrypoint
@@ -6,7 +5,14 @@ set -e
 # but only works if all arguments require a hyphenated flag
 # -v; -SL; -f arg; etc will work, but not arg1 arg2
 if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
-    set -- varnishd -F -f /etc/varnish/default.vcl -a http=:80,HTTP -a proxy=:8443,PROXY -s malloc,$VARNISH_SIZE "$@"
+    set -- varnishd \
+	    -F \
+	    -f /etc/varnish/default.vcl \
+	    -a http=:80,HTTP \
+	    -a proxy=:8443,PROXY \
+	    -p feature=+http2 \
+	    -s malloc,$VARNISH_SIZE \
+	    "$@"
 fi
 
 exec "$@"
diff --git a/varnish_stable/docker-varnish-entrypoint b/varnish_stable/docker-varnish-entrypoint
index e1f02c8..54efa98 100755
--- a/varnish_stable/docker-varnish-entrypoint
+++ b/varnish_stable/docker-varnish-entrypoint
@@ -6,7 +5,14 @@ set -e
 # but only works if all arguments require a hyphenated flag
 # -v; -SL; -f arg; etc will work, but not arg1 arg2
 if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
-    set -- varnishd -F -f /etc/varnish/default.vcl -a http=:80,HTTP -a proxy=:8443,PROXY -s malloc,$VARNISH_SIZE "$@"
+    set -- varnishd \
+	    -F \
+	    -f /etc/varnish/default.vcl \
+	    -a http=:80,HTTP \
+	    -a proxy=:8443,PROXY \
+	    -p feature=+http2 \
+	    -s malloc,$VARNISH_SIZE \
+	    "$@"
 fi
 
 exec "$@"

@yosifkit yosifkit merged commit 4d80386 into docker-library:master Sep 29, 2020
@gquintard
Copy link
Contributor Author

thanks @yosifkit!
May I use the opportunity to ask for some attention on #8674 ? (yes, I know i shouldn't do and I know you are busy, but I promise I won't do it often é_è )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants