From 54d05b76265503cd54e039f2d3034e3da6b2c551 Mon Sep 17 00:00:00 2001
From: Stefanos Malliaros <stef.malliaros@gmail.com>
Date: Sun, 9 Oct 2022 15:30:28 +0100
Subject: [PATCH 1/3] debug

---
 .env       |  2 +-
 Dockerfile | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index f97636c..9cf42df 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-caddy_version=2.5.2
+CADDY_VERSION=2.5.2
diff --git a/Dockerfile b/Dockerfile
index 008220c..7c630e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 # desired Caddy version
-ARG VERSION
+ARG CADDY_VERSION
 
 ###########
 # builder #
-FROM caddy:${VERSION}-builder-alpine AS builder
-ARG VERSION
-RUN xcaddy build v${VERSION} \
+FROM caddy:${CADDY_VERSION}-builder-alpine AS builder
+ARG CADDY_VERSION
+RUN xcaddy build v${CADDY_VERSION} \
   --with github.com/caddy-dns/cloudflare \
   --with github.com/corazawaf/coraza-caddy
 
 #########
 # image #
-FROM caddy:${VERSION}-alpine
+FROM caddy:${CADDY_VERSION}-alpine
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

From bb8e048cf218736759545e2c404cc03a4e608da4 Mon Sep 17 00:00:00 2001
From: Stefanos Malliaros <stef.malliaros@gmail.com>
Date: Sun, 9 Oct 2022 15:30:33 +0100
Subject: [PATCH 2/3] debug

---
 .github/workflows/build-scan.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-scan.yml b/.github/workflows/build-scan.yml
index b62b95a..46aa629 100644
--- a/.github/workflows/build-scan.yml
+++ b/.github/workflows/build-scan.yml
@@ -29,7 +29,7 @@ jobs:
           load: true # Export to Docker Engine rather than pushing to a registry
           tags: steevi/caddy-cloudflare:${{ env.caddy_version }}
           build-args: |
-            VERSION=${{ env.caddy_version }}
+            CADDY_VERSION=${{ env.caddy_version }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master

From 5336c7dcfd23ea9996d69009a9f1159c0cc76fcf Mon Sep 17 00:00:00 2001
From: Stefanos Malliaros <stef.malliaros@gmail.com>
Date: Sun, 9 Oct 2022 15:32:25 +0100
Subject: [PATCH 3/3] debug

---
 .github/workflows/build-release.yml | 4 ++--
 .github/workflows/build-scan.yml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index bf5e587..8c35b75 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -32,6 +32,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: steevi/caddy-cloudflare:${{ env.caddy_version }}-waf
+          tags: steevi/caddy-cloudflare:${{ env.CADDY_VERSION }}-waf
           build-args: |
-            VERSION=${{ env.caddy_version }}
+            CADDY_VERSION=${{ env.CADDY_VERSION }}
diff --git a/.github/workflows/build-scan.yml b/.github/workflows/build-scan.yml
index 46aa629..56d17c3 100644
--- a/.github/workflows/build-scan.yml
+++ b/.github/workflows/build-scan.yml
@@ -27,14 +27,14 @@ jobs:
         with:
           push: false
           load: true # Export to Docker Engine rather than pushing to a registry
-          tags: steevi/caddy-cloudflare:${{ env.caddy_version }}
+          tags: steevi/caddy-cloudflare:${{ env.CADDY_VERSION }}
           build-args: |
-            CADDY_VERSION=${{ env.caddy_version }}
+            CADDY_VERSION=${{ env.CADDY_VERSION }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'steevi/caddy-cloudflare:${{ env.caddy_version }}'
+          image-ref: 'steevi/caddy-cloudflare:${{ env.CADDY_VERSION }}'
           format: 'sarif'
           output: 'trivy-results.sarif'