Moved version arg to env in dockerfile

cjww-development · Jun 15, 2022 · 19b254a · 19b254a
1 parent 81954b5
commit 19b254a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM adoptopenjdk/openjdk14
 
-ARG VERSION
+ARG GK_VERSION
+ENV VERSION $GK_VERSION
 
 RUN mkdir -p /opt/docker
 WORKDIR /opt/docker
@@ -9,5 +10,6 @@ RUN echo $VERSION
 
 COPY ./target/universal/gatekeeper-${VERSION}.tgz /opt/docker/
 RUN tar zxvf gatekeeper-${VERSION}.tgz -C /opt/docker/
+RUN rm /opt/docker/gatekeeper-${VERSION}.tgz
 
 ENTRYPOINT /opt/docker/gatekeeper-${VERSION}/bin/gatekeeper -Dhttp.port=80 -Dversion=${VERSION} -Dlogger.resource=logback-prod.xml -Dlogging.coloured=false
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - ~/logs:/opt/docker/gatekeeper-$VERSION/logs
       - $HOME/.aws:/root/.aws
     environment:
-      VERSION: $VERSION
+#      VERSION: $VERSION
       EMAIL_FROM: "test@email.com"
       MONGO_URI: "mongodb://mongo.local"
       APP_SECRET: "23817cc7d0e6460e9c1515aa4047b29b"