From 31320f3796cbcc8fb8576c9c63ef80175ac7834f Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Mon, 18 Aug 2025 19:04:28 +0200
Subject: [PATCH] publish custom varnish image to ghcr.io

---
 .drone.yml                     | 20 ++++++++++++++++++--
 .kubernetes/config-varnish.yml |  2 +-
 varnish/Dockerfile             |  2 --
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 63b154b..9a11e2d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,12 +33,28 @@ platform:
   arch: amd64
 
 steps:
-  - name: Publish to ghcr
+  - name: Publish app to ghcr
     image: plugins/docker
     settings:
       registry: ghcr.io
       repo: ghcr.io/kevinmidboe/${DRONE_REPO_NAME}
       dockerfile: Dockerfile
+      compress: true
+      username:
+        from_secret: GITHUB_USERNAME
+      password:
+        from_secret: GHCR_UPLOAD_TOKEN
+      tags:
+        - latest
+        - ${DRONE_COMMIT_SHA}
+
+  - name: Publish varnish to ghcr
+    image: plugins/docker
+    settings:
+      registry: ghcr.io
+      repo: ghcr.io/kevinmidboe/varnish-infra-map
+      dockerfile: varnish/Dockerfile
+      compress: true
       username:
         from_secret: GITHUB_USERNAME
       password:
@@ -129,6 +145,6 @@ volumes:
     temp: {}
 ---
 kind: signature
-hmac: 83b1ec6458ceddef038000faac2b391d192530ceb681b790ad79c90456f12cca
+hmac: 8e51cded679321781a79fa1f393fe3c23b56426129aa557eee6f14f4f2618076
 
 ...
diff --git a/.kubernetes/config-varnish.yml b/.kubernetes/config-varnish.yml
index cb3a38d..3d31f74 100644
--- a/.kubernetes/config-varnish.yml
+++ b/.kubernetes/config-varnish.yml
@@ -4,7 +4,7 @@ metadata:
   name: varnish-vcl
   namespace: ${NAMESPACE}
 data:
-  default.vcl: |
+  default.vcl: |-
     vcl 4.0;
 
     import std;
diff --git a/varnish/Dockerfile b/varnish/Dockerfile
index 742775a..0752b03 100644
--- a/varnish/Dockerfile
+++ b/varnish/Dockerfile
@@ -21,8 +21,6 @@ RUN git clone https://github.com/varnish/libvmod-digest.git /opt/libvmod-digest
     ./configure VARNISHSRC=/usr/include/varnish && \
     make && make install
 
-COPY default.vcl /etc/varnish/default.vcl
-
 EXPOSE 6081
 
 CMD ["varnishd", "-F", "-f", "/etc/varnish/default.vcl", "-a", ":6081", "-s", "malloc,512m"]