From 47b4a24e1b6db83442820db01044b57e99909956 Mon Sep 17 00:00:00 2001
From: James Smith <james@floppy.org.uk>
Date: Thu, 11 Mar 2021 22:33:58 +0000
Subject: [PATCH] another try to fix version setup

---
 .github/workflows/docker-publish.yml |  4 ++--
 Dockerfile                           | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b4c366518..3ed5f0a27 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -51,6 +51,6 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          secrets: |
+          build-args: |
             VAN_DAM_GIT_REF=$CI_REF_NAME
-            VAN_DAM_GIT_SHA=$CI_SHA
+            VAN_DAM_GIT_SHA=$CI_SHA_SHORT
diff --git a/Dockerfile b/Dockerfile
index feb48ee66..3802314c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,15 @@ FROM ruby:3.0-alpine AS build
 RUN apk add --no-cache tzdata alpine-sdk postgresql-dev nodejs yarn python2
 RUN gem install foreman
 
-ENV PORT 3214
-ENV RACK_ENV production
-ENV NODE_ENV production
-ENV RAILS_SERVE_STATIC_FILES true
-ENV VAN_DAM_GIT_REF $CI_REF_NAME
-ENV VAN_DAM_GIT_SHA $CI_SHA_SHORT
+ARG VAN_DAM_GIT_REF
+ARG VAN_DAM_GIT_SHA
+
+ENV PORT=3214
+ENV RACK_ENV=production
+ENV NODE_ENV=production
+ENV RAILS_SERVE_STATIC_FILES=true
+ENV VAN_DAM_GIT_REF=${VAN_DAM_GIT_REF}
+ENV VAN_DAM_GIT_SHA=${VAN_DAM_GIT_SHA}
 
 WORKDIR /usr/src/app