ci: docker: deploy automatically only on default branch and tags

In commit fecd899e8189 ("docker: deploy only manually and on
master/tags") we've introduced manual deployment of the Docker images,
but this is unneeded additional manual step, so rather prefer automatic
deployment. While at it, convert to usage of `rules:` as `only:` is
deprecated and `rules:` are preferred.

Signed-off-by: Petr Štetiar <ynezz@true.cz>

diff --git a/.gitlab/docker.yml b/.gitlab/docker.yml
index 914043204df4cbd09bb3b5212bcf4dbb2e33336a..5cc4951fa0b894d5311f5d6498ff93ca7f8f25b8 100644 (file)
--- a/.gitlab/docker.yml
+++ b/.gitlab/docker.yml
@@ -23,10 +23,9 @@
 
 .deploy Docker image:
   extends: .docker in docker
-  only:
-    - master
-    - tags
-  when: manual
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
     - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/deploy Docker image \(.*\)/\1/')"
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY