From 67e44db5c34f6d2362460e4010cee54fa2146a2a Mon Sep 17 00:00:00 2001
From: Roan Hofland <roan@roanh.dev>
Date: Fri, 18 Mar 2022 00:35:46 +0100
Subject: [PATCH] Fix docker image tagging

---
 .gitlab-ci.yml | 4 ++--
 Dockerfile     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 702328f..97acf1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,10 +120,10 @@ hub:
   script:
     - docker info
     - docker build -t gmark .
-    - docker tag gmark roanh/gmark:${VERSION:1}
+    - docker tag gmark roanh/gmark:${CI_COMMIT_REF_NAME:1}
     - docker tag gmark roanh/gmark:latest
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    - docker push roanh/gmark:${VERSION:1}
+    - docker push roanh/gmark:${CI_COMMIT_REF_NAME:1}
     - docker push roanh/gmark:latest
   stage: publishing
   allow_failure: false
diff --git a/Dockerfile b/Dockerfile
index 4348d39..e4bf05e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,5 +13,5 @@ RUN ./gradlew :cliJar
 FROM openjdk:8
 LABEL maintainer="roan@roanh.dev"
 WORKDIR /gMark
-COPY --from=compile /gMark/build/libs/gMark-cli-SNAPSHOT.jar ./gMark.jar
+COPY --from=compile /gMark/build/libs/gMark-cli.jar ./gMark.jar
 ENTRYPOINT ["java", "-jar", "gMark.jar"]
\ No newline at end of file