Merge branch '28-fix-automagic-job-docker' into 'development'

fix(docker): job only run on dockerfile exists

Closes #28

See merge request nofusscomputing/projects/gitlab-ci!31

docker/build.gitlab-ci.yaml

@@ -99,10 +99,19 @@ variables:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
     - if: $CI_COMMIT_TAG
+      exists:
+        - dockerfile
+        - dockerfile.j2
       when: on_success
     - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "push"'
+      exists:
+        - dockerfile
+        - dockerfile.j2
       when: on_success
     - if: '$CI_COMMIT_BRANCH != "master" && $CI_PIPELINE_SOURCE == "push"'
+      exists:
+        - dockerfile
+        - dockerfile.j2
       when: always
     - when: never
 

docker/publish.gitlab-ci.yaml

@@ -90,7 +90,6 @@
       fi
 
     - docker logout docker.io
-  needs: [ "Docker Container" ]
   environment:
     name: DockerHub
     url: $DOCKER_IMAGE_PUBLISH_URL

template/docker-image.gitlab-ci.yaml

@@ -32,6 +32,7 @@ Docker Container:
 
 Docker Hub:
   extends: .publish-docker-hub
+  needs: [ "Docker Container" ]
 
 
 Gitlab Release: