From e2b4ec88ab076fd276e6adfc77a347eb6d3493d9 Mon Sep 17 00:00:00 2001 From: Donislav Belev Date: Tue, 11 Jun 2019 11:36:00 +0300 Subject: [PATCH 1/2] Update docker image and varnish --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 242c0d5..206a068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,23 @@ # Starting from Ubuntu and not from alpine, as libvmod-dynamic used for generating dynamic backends # compiles currently only on debian based images. -FROM ubuntu:trusty +FROM ubuntu:bionic ENV VARNISHSRC=/usr/include/varnish VMODDIR=/usr/lib/varnish/vmods RUN apt-get update -q && \ - apt-get install -qq git curl apt-transport-https autotools-dev automake autoconf libtool python make python-docutils && \ - curl -L https://packagecloud.io/varnishcache/varnish41/gpgkey | sudo apt-key add - && \ - echo "deb https://packagecloud.io/varnishcache/varnish41/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/varnish-cache.list && \ + apt-get install -qq git curl apt-transport-https autotools-dev automake autoconf libtool python make python-docutils sudo gnupg2 && \ + curl -L https://packagecloud.io/varnishcache/varnish60/gpgkey | sudo apt-key add - && \ + echo "deb https://packagecloud.io/varnishcache/varnish60/ubuntu/ bionic main" | tee /etc/apt/sources.list.d/varnish-cache.list && \ apt-get -q update && \ apt-get install -qq varnish varnish-dev && \ cd / && echo "-------mod-dynamic build -------" && \ - git clone -b 4.1 https://github.com/nigoroll/libvmod-dynamic.git && \ + git clone -b 6.0 https://github.com/nigoroll/libvmod-dynamic.git && \ cd libvmod-dynamic && \ ./autogen.sh && \ ./configure && \ make && \ make install && \ - apt-get remove -qq git curl apt-transport-https autotools-dev automake autoconf libtool python make python-docutils --force-yes && \ + apt-get remove -qq git curl apt-transport-https autotools-dev automake autoconf libtool python make python-docutils gnupg2 --allow-remove-essential && \ apt-get -qq autoremove && \ apt-get -qq clean && \ rm -rf /libvmod-dynamic From f57d2eeeeb66d30a266d3f7a0a71b52b11558136 Mon Sep 17 00:00:00 2001 From: Donislav Belev Date: Wed, 17 Jul 2019 11:48:58 +0300 Subject: [PATCH 2/2] Update Varnish to 6.2 --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 206a068..bb6cbc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,13 @@ ENV VARNISHSRC=/usr/include/varnish VMODDIR=/usr/lib/varnish/vmods RUN apt-get update -q && \ apt-get install -qq git curl apt-transport-https autotools-dev automake autoconf libtool python make python-docutils sudo gnupg2 && \ - curl -L https://packagecloud.io/varnishcache/varnish60/gpgkey | sudo apt-key add - && \ - echo "deb https://packagecloud.io/varnishcache/varnish60/ubuntu/ bionic main" | tee /etc/apt/sources.list.d/varnish-cache.list && \ + curl -L https://packagecloud.io/varnishcache/varnish62/gpgkey | sudo apt-key add - && \ + echo "deb https://packagecloud.io/varnishcache/varnish62/ubuntu/ bionic main" | tee /etc/apt/sources.list.d/varnish-cache.list && \ apt-get -q update && \ + apt-get install -qq libgetdns-dev && \ apt-get install -qq varnish varnish-dev && \ cd / && echo "-------mod-dynamic build -------" && \ - git clone -b 6.0 https://github.com/nigoroll/libvmod-dynamic.git && \ + git clone -b 6.2 https://github.com/nigoroll/libvmod-dynamic.git && \ cd libvmod-dynamic && \ ./autogen.sh && \ ./configure && \