From 2490b779eb40c267268dcdf6e30ce260e67faa33 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Fri, 20 May 2022 15:26:49 +0200
Subject: [PATCH] fix: fix build version in ci

---
 .drone.yml | 14 +++-----------
 Dockerfile |  5 ++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 764660a..99a75a4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,6 +32,8 @@ steps:
     commands:
       - apt-get -qq update && apt-get install -yqq --no-install-recommends make
       - make build
+    environment:
+      BUILD_VERSION: ${DRONE_TAG%-*}
 
   - name: verify
     image: dart:stable
@@ -44,15 +46,9 @@ steps:
   - name: dryrun
     image: thegeeklab/drone-docker-buildx:20
     settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
       dockerfile: Dockerfile
       dry_run: true
-      password:
-        from_secret: docker_password
       repo: thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: docker_username
     when:
       ref:
         - refs/pull/**
@@ -92,8 +88,6 @@ steps:
   - name: publish-dockerhub
     image: thegeeklab/drone-docker-buildx:20
     settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
       dockerfile: Dockerfile
       password:
         from_secret: docker_password
@@ -110,8 +104,6 @@ steps:
   - name: publish-quay
     image: thegeeklab/drone-docker-buildx:20
     settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
       dockerfile: Dockerfile
       password:
         from_secret: quay_password
@@ -217,6 +209,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: c395bc7653458c3fa8c3bd62cb9f615d3af8c53e7c929b1ea90b6c3a71738e6e
+hmac: 8746fe501b443c4f93f766414ef030b10c28cdc0cc19ca5984601c4bb5f98bf6
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 4ad0c57..9963738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,13 +7,12 @@ LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/link-validato
 LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/link-validator"
 LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/link-validator"
 
-ARG BUILD_VERSION
+ARG CADDY_VERSION
 ARG WAIT_FOR_VERSION
 ARG CONTAINER_LIBRARY
 
-
 # renovate: datasource=github-releases depName=caddyserver/caddy
-ENV CADDY_VERSION="${BUILD_VERSION:-v2.5.1}"
+ENV CADDY_VERSION="${CADDY_VERSION:-v2.5.1}"
 # renovate: datasource=github-releases depName=thegeeklab/wait-for
 ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.2.0}"
 # renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library