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/.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 b62b95a..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: | - 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' 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