From 8ca1621f90609cb3eb0cca24a29d5a4e9b96c652 Mon Sep 17 00:00:00 2001
From: Ivan Nikolov <ivan.nikolov@ft.com>
Date: Mon, 10 Apr 2023 10:31:03 +0300
Subject: [PATCH] Upgrade Dockerfile base image from Ubuntu 18.04 LTS to 22.04
 LTS

Switch from Varnish 6.2 to 6.0 LTS version. There is no 6.2 build for Ubuntu 22.04 LTS.
---
 Dockerfile | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb6cbc2..c25d7c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,35 @@
 # Starting from Ubuntu and not from alpine, as libvmod-dynamic used for generating dynamic backends
 # compiles currently only on debian based images.
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
-ENV VARNISHSRC=/usr/include/varnish VMODDIR=/usr/lib/varnish/vmods
+# Install build dependencies
+RUN apt-get update && \
+    apt-get install -y curl apt-transport-https gnupg && \
+    curl -L https://packagecloud.io/varnishcache/varnish60lts/gpgkey | apt-key add - && \
+    echo "deb https://packagecloud.io/varnishcache/varnish60lts/ubuntu/ jammy main" | tee /etc/apt/sources.list.d/varnish-cache.list && \
+    apt-get update && \
+    apt-get install -y libgetdns-dev varnish=6.0.11-1~jammy varnish-dev=6.0.11-1~jammy
 
-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/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.2 https://github.com/nigoroll/libvmod-dynamic.git && \
-    cd libvmod-dynamic && \
+# Clone and compile libvmod-dynamic
+RUN apt-get -y install git autotools-dev automake autoconf libtool make docutils-common
+RUN git clone -b 6.0 https://github.com/nigoroll/libvmod-dynamic.git /tmp/libvmod-dynamic && \
+    cd /tmp/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 gnupg2 --allow-remove-essential && \
-    apt-get -qq autoremove && \
-    apt-get -qq clean && \
-    rm -rf /libvmod-dynamic
+    make install
 
+# Remove build dependencies and clean up
+RUN apt-get remove -y curl apt-transport-https gnupg git autotools-dev automake autoconf libtool make docutils-common varnish-dev && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
+
+WORKDIR /
 COPY default.vcl /etc/varnish/default.vcl
 COPY start.sh /start.sh
-
 RUN chmod +x /start.sh
+
+# Expose port and start
 EXPOSE 80
 CMD ["/start.sh"]