Merge pull request #9974 from gquintard/varnish_trampoline

[varnish] overload the binaries with scripts

library/varnish

@@ -1,13 +1,13 @@
-# this file was generated using https://github.com/varnish/docker-varnish/blob/3b38b0e1c38c1f6324ac8afa156ff73cfbbffcf4/populate.sh
+# this file was generated using https://github.com/varnish/docker-varnish/blob/51a66e74c3a56e4def767d3ad3f6c8ad1a4addaa/populate.sh
 Maintainers: Guillaume Quintard <[email protected]> (@gquintard)
 GitRepo: https://github.com/varnish/docker-varnish.git
 
 Tags: 6.0, 6.0.7-1, 6.0.7, stable
 Architectures: amd64
 Directory: stable/debian
-GitCommit: 3b38b0e1c38c1f6324ac8afa156ff73cfbbffcf4
+GitCommit: 51a66e74c3a56e4def767d3ad3f6c8ad1a4addaa
 
 Tags: 6.6, 6.6.0-1, 6.6.0, 6, latest, fresh
 Architectures: amd64
 Directory: fresh/debian
-GitCommit: 3b38b0e1c38c1f6324ac8afa156ff73cfbbffcf4
+GitCommit: 51a66e74c3a56e4def767d3ad3f6c8ad1a4addaa

test/config.sh

@@ -262,6 +262,9 @@ imageTests+=(
 	[tomcat]='
 		tomcat-hello-world
 	'
+	[varnish]='
+		varnish
+	'
 	[wordpress:apache]='
 		wordpress-apache-run
 	'

test/tests/varnish/run.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+vname="varnish-volume-$RANDOM-$RANDOM"
+trap "docker volume rm $vname > /dev/null" EXIT
+docker volume create --driver local \
+	--opt type=tmpfs \
+	--opt device=tmpfs \
+	--opt o=size=100m \
+	$vname
+
+
+cname="varnish-container-$RANDOM-$RANDOM"
+cid="$(
+	docker run -d \
+		-v $vname:/var/lib/varnish \
+		--name "$cname" \
+		"$image" \
+		varnishd -F -a 0:0 -f /etc/varnish/default.vcl
+)"
+trap "docker rm -vf $cid > /dev/null; docker volume rm $vname > /dev/null" EXIT
+
+sidecar() {
+	docker run --rm -i \
+		--network container:"$cid" \
+		-v $vname:/var/lib/varnish \
+		"$image" \
+		"$@" > /dev/null
+}
+
+sidecar varnishlog -d
+sidecar varnishncsa -d
+sidecar varnishstat -1
+sidecar varnishreload
+sidecar varnishadm ping