From 205153e562ba26ff0a0a0d479cbe2749828d7618 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Thu, 28 Mar 2019 16:43:57 -0400
Subject: [PATCH] New system

---
 .gitlab-ci.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 355648b..77cfead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,31 +12,39 @@ variables:
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
 
-before_script:
-  - docker info
-  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
-
 build:
+  before_script:
+    - docker info
   stage: Build Image
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" .
+    - docker build --pull -t "$CI_COMMIT_SHORT_SHA" .
 
 push-master:
   stage: Push to Docker Hub
+  before_script:
+  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
   script:
-    - docker push "$CI_REGISTRY_IMAGE"
+    - docker tag "$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE"
+    - docker push "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_URL"
+  after_script:
+    - docker logout
   only:
     - master
 
 push-other:
   stage: Push to Docker Hub
+  before_script:
+  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
   script:
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+    - docker tag "$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_URL"
+  after_script:
+    - docker logout
   except:
     - master
 
 cleanup:
   stage: Cleanup Runner
   script:
-    - docker logout
-    - docker image prune --all --force
\ No newline at end of file
+    - docker image prune --all --force
+  when: always
\ No newline at end of file