chore: crop v from tag for version argument

famedly · Oct 19, 2023 · 2dad8fc · 2dad8fc
1 parent 1585c78
commit 2dad8fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -13,5 +13,7 @@ jobs:
       registry_user: famedly-ci
       registry: docker-oss.nexus.famedly.de
       image_name: powerdns
-      build_args: "VERSION=${{ github.ref_name }}"
+      build_args: "VERSION=$(${{ github.ref_name }}#v)"
+        #      tags: |
+        #        type=ref,prefix=v,event=tag
     secrets: inherit
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,12 @@
 FROM docker.io/alpine:3.18
 ARG VERSION
+RUN apk --no-cache add bash
+SHELL ["/bin/bash", "-c"]
 RUN apk --no-cache add \
-    pdns=${VERSION} \
-    pdns-backend-pgsql=${VERSION} \
-    pdns-tools \
-    libcap
+      pdns=${VERSION#v} \
+      pdns-backend-pgsql=${VERSION#v} \
+      pdns-tools \
+      libcap
 
 RUN setcap 'cap_net_bind_service=+eip' /usr/sbin/pdns_server