From 0ff6915de4485766894c4541ffaa689d1293c925 Mon Sep 17 00:00:00 2001
From: Evan Richardson <evanrich81@gmail.com>
Date: Sat, 7 Oct 2023 04:37:31 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3e2dd7..4060bec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
 stages:
 #- test
 - build
-- push_local
+#- push_local
 #- release
 #- push_dockerhub
 
@@ -37,30 +37,31 @@ build:
   script:
   - nslookup registry.evanshome.io
   #- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  #- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   #- docker pull $CI_REGISTRY_IMAGE:latest || true
   - >
     docker build
-    --pull
-    --cache-from $CI_REGISTRY_IMAGE:latest
-    --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+    --tag $CI_REGISTRY_IMAGE:latest
     --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
     --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA
     ./Docker/
-  - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+  - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+  - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+  #- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
-push local:
-  extends:
-    - .docker_base
-  stage: push_local
-  variables:
-    GIT_STRATEGY: none
-  only:
-  - master
-  script:
-  - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
-  - docker push $CI_REGISTRY_IMAGE:latest
+# push local:
+#   extends:
+#     - .docker_base
+#   stage: push_local
+#   variables:
+#     GIT_STRATEGY: none
+#   only:
+#   - master
+#   script:
+#   - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+#   - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
+#   - docker push $CI_REGISTRY_IMAGE:latest
 
 # push dockerhub:
 #   extends: