From 1d8136f998b7579b035072b2cfe94a5195c1883c Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 20:03:26 +0000
Subject: [PATCH] Fix me being dumb

---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d325a75..a2ef25b 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,13 +53,13 @@ Docker Build:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
-    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
+    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
+    - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
 
   script:
-    - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
-    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
-    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
-    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
+    - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
+    - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
+
 
 .docker_push: &docker_push
   image: docker:20.10.8
@@ -72,10 +72,12 @@ Docker Build:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
+    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
 
   script:
     - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
     - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
     - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
 
 Push Latest: