Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -1,15 +1,13 @@
 # This file is a template, and might need editing before it works on your project.
+docker-build-master:
   # Official docker image.
-image: docker:19.03.0
+  image: docker:latest
-
+  stage: build
   services:
-  - docker:19.03-dind
+    - docker:dind
-
-stages:
-  - build
 
   variables:
-  DOCKER_HOST: tcp://localhost:2375
+  #DOCKER_HOST: tcp://localhost:2375
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
   #IMAGE_TAG: erichardson/py-eagle-mqtt:$CI_COMMIT_TAG
@@ -19,17 +17,22 @@ before_script:
     - docker version
     - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
-build:
-  stage: build
   script:
-    - docker build -t $IMAGE_TAG -t $CI_COMMIT_TAG ./Docker/
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-    - docker push $IMAGE_TAG $CI_COMMIT_TAG
+    - docker push "$CI_REGISTRY_IMAGE"
+  only:
+    - master
 
-#build:
+docker-build:
-#  stage: build
+  # Official docker image.
-#  script:
+  image: docker:latest
-#    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+  stage: build
-#    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  services:
-#  except:
+    - docker:dind
-#    - master
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  except:
+    - master