From c6efe498e6decd0a05155cdc0799ead193ab0ceb Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Wed, 15 Apr 2020 12:18:23 +0200 Subject: [PATCH 1/2] Update Varnish Modules to 0.16 from 0.15 --- docker/README.md | 2 +- docker/varnish/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/README.md b/docker/README.md index a0ec190a..a8675a9f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -13,7 +13,7 @@ Use a Docker containers cluster to have a [typical architecture for eZ Platform] - [eZ Platform Enterprise Edition](https://ez.no/Products/eZ-Platform-Enterprise-Edition) 2.5 * Reverse Proxy Cache Server: - Varnish 6.0 - - Varnish Modules 0.15 + - Varnish Modules 0.16 * [Persistence Cache](https://doc.ezplatform.com/en/2.5/guide/persistence_cache/) and [Session Handling](https://doc.ezplatform.com/en/2.5/guide/sessions/) Servers: - Redis 3.2 * DataBase Server: diff --git a/docker/varnish/Dockerfile b/docker/varnish/Dockerfile index 9869fc86..8a42c1aa 100644 --- a/docker/varnish/Dockerfile +++ b/docker/varnish/Dockerfile @@ -5,8 +5,8 @@ LABEL description="Varnish 6.0 with Varnish Modules for eZ Platform usage" #ENV HTTPCACHE_VARNISH_INVALIDATE_TOKEN=docker -# Varnish Modules — https://github.com/varnish/varnish-modules/blob/0.15.0/README.rst#installation -ARG VMODS_VERSION=0.15.0 +# Varnish Modules — https://github.com/varnish/varnish-modules/blob/0.16.0/README.rst#installation +ARG VMODS_VERSION=0.16.0 RUN apt-get update && apt-get install -y make pkg-config varnish-dev wget \ && wget --quiet https://download.varnish-software.com/varnish-modules/varnish-modules-${VMODS_VERSION}.tar.gz \ && tar -xzf varnish-modules-${VMODS_VERSION}.tar.gz \ From b401cd4f3460d78c90a7dc89d82c465951e7c2c0 Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Tue, 12 May 2020 16:40:03 +0200 Subject: [PATCH 2/2] varnish/Dockerfile: Update release URL & build --- docker/varnish/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/varnish/Dockerfile b/docker/varnish/Dockerfile index 106d69e8..6eaff12b 100644 --- a/docker/varnish/Dockerfile +++ b/docker/varnish/Dockerfile @@ -7,10 +7,11 @@ LABEL description="Varnish 6.0 with Varnish Modules for eZ Platform usage" # Varnish Modules — https://github.com/varnish/varnish-modules/blob/0.16.0/README.rst#installation ARG VMODS_VERSION=0.16.0 -RUN apt-get update && apt-get install -y make pkg-config varnish-dev wget \ - && wget --quiet https://download.varnish-software.com/varnish-modules/varnish-modules-${VMODS_VERSION}.tar.gz \ +RUN apt-get update && apt-get install -y autotools-dev automake libtool m4 make pkg-config varnish-dev wget \ + && wget --quiet https://github.com/varnish/varnish-modules/archive/${VMODS_VERSION}.tar.gz -O varnish-modules-${VMODS_VERSION}.tar.gz \ && tar -xzf varnish-modules-${VMODS_VERSION}.tar.gz \ && cd varnish-modules-${VMODS_VERSION} \ + && ./bootstrap \ && ./configure \ && make && make install \ && cd .. \