From c47a19b67eca86bdfdaa35a373ddffb87681f511 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 18 Oct 2019 22:56:16 -0400
Subject: [PATCH] Changed ID to use for image tag; fixed trying to load
 non-existent image; version push is now automatic

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78acac1..890bcbd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,14 +24,12 @@ stages:
     - 0-build-base
   tags:
     - docker
-  when: manual
   before_script:
     - docker load --input "./images/$CI_COMMIT_SHORT_SHA.tar"
-    - docker load --input "./images/$CI_COMMIT_SHORT_SHA-git.tar"
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
   script:
-    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_JOB_ID"
-    - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_ID"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_PIPELINE_ID"
+    - docker push "$CI_REGISTRY_IMAGE:$CI_PIPELINE_ID"
 
 1B-push-latest:
   stage: Push Images
@@ -42,7 +40,6 @@ stages:
   when: manual
   before_script:
     - docker load --input "./images/$CI_COMMIT_SHORT_SHA.tar"
-    - docker load --input "./images/$CI_COMMIT_SHORT_SHA-git.tar"
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
   script:
     - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:latest"