Merged
Conversation
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 "$@" |
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
another 6 months, another release :-)