diff options
| -rw-r--r-- | build/test/gondul-varnish-test.Dockerfile | 4 | ||||
| -rwxr-xr-x | build/test/varnish-init.sh | 4 | ||||
| -rw-r--r-- | extras/misc/varnish.vcl | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/build/test/gondul-varnish-test.Dockerfile b/build/test/gondul-varnish-test.Dockerfile index 7e75b86..90bd369 100644 --- a/build/test/gondul-varnish-test.Dockerfile +++ b/build/test/gondul-varnish-test.Dockerfile @@ -2,7 +2,5 @@ FROM debian:jessie RUN apt-get update RUN apt-get -y install varnish -RUN rm /etc/varnish/default.vcl -ADD extras/misc/varnish.vcl /etc/varnish/default.vcl -CMD varnishd -a :80 -f /etc/varnish/default.vcl -F +CMD /opt/gondul/build/test/varnish-init.sh EXPOSE 80 diff --git a/build/test/varnish-init.sh b/build/test/varnish-init.sh new file mode 100755 index 0000000..9b16722 --- /dev/null +++ b/build/test/varnish-init.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +touch /opt/gondul/data/varnish-auth.vcl +exec varnishd -a :80 -f /opt/gondul/extras/misc/varnish.vcl -F diff --git a/extras/misc/varnish.vcl b/extras/misc/varnish.vcl index 4920963..8f67a4d 100644 --- a/extras/misc/varnish.vcl +++ b/extras/misc/varnish.vcl @@ -2,6 +2,8 @@ vcl 4.0; +include "/opt/gondul/data/varnish-auth.vcl"; + backend default { .host = "gondul-front"; .port = "80"; |