New system

.gitlab-ci.yml

@@ -12,31 +12,39 @@ variables:
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
 
+build:
   before_script:
     - docker info
-  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
-
-build:
   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
+  when: always