another try to fix version setup

manyfold3d · Mar 11, 2021 · 47b4a24 · 47b4a24
1 parent 2dc2d57
commit 47b4a24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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