Merge branch 'feature-ci' into 'master'

feat: add docker publishing for feature branches

See merge request postgres-ai/custom-images!8

Author: anatolystansler

extended/build-images-ci.yml

@@ -13,19 +13,34 @@
     variables:
       - $CI_COMMIT_TAG =~ /^[0-9.]+$/
 
-.template: &extended_image_definition
+.only_var_template: &only_feature
+  only:
+    refs:
+      - branches
+    variables:
+      - $CI_COMMIT_REF_SLUG != "master"
+  when: manual
+
+.template: &extended_image_definition_dh
   variables: &extended_image_vars
     REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
     REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
     REGISTRY: "${DH_CI_REGISTRY}"
     DOCKER_FILE: "extended/Dockerfile"
     DOCKER_NAME: "postgresai/extended-postgres"
 
+.template: &extended_image_definition_gl
+  variables: &extended_image_vars
+    REGISTRY_USER: "${CI_REGISTRY_USER}"
+    REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
+    REGISTRY: "${CI_REGISTRY}"
+    DOCKER_FILE: "extended/Dockerfile"
+    DOCKER_NAME: "registry.gitlab.com/postgres-ai/custom-images/extended-postgres"
 
 build-extended-postgres-9-6-image-latest:
   <<: *build_image_definition
   <<: *only_tag_release
-  <<: *extended_image_definition
+  <<: *extended_image_definition_dh
   variables:
     PG_SERVER_VERSION: "9.6"
     <<: *extended_image_vars
@@ -34,7 +49,7 @@ build-extended-postgres-9-6-image-latest:
 build-extended-postgres-10-image-latest:
   <<: *build_image_definition
   <<: *only_tag_release
-  <<: *extended_image_definition
+  <<: *extended_image_definition_dh
   variables:
     PG_SERVER_VERSION: "10"
     <<: *extended_image_vars
@@ -43,7 +58,7 @@ build-extended-postgres-10-image-latest:
 build-extended-postgres-11-image-latest:
   <<: *build_image_definition
   <<: *only_tag_release
-  <<: *extended_image_definition
+  <<: *extended_image_definition_dh
   variables:
     PG_SERVER_VERSION: "11"
     <<: *extended_image_vars
@@ -52,7 +67,43 @@ build-extended-postgres-11-image-latest:
 build-extended-postgres-12-image-latest:
   <<: *build_image_definition
   <<: *only_tag_release
-  <<: *extended_image_definition
+  <<: *extended_image_definition_dh
+  variables:
+    PG_SERVER_VERSION: "12"
+    <<: *extended_image_vars
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
+
+build-extended-postgres-9-6-image-feature:
+  <<: *build_image_definition
+  <<: *only_feature
+  <<: *extended_image_definition_gl
+  variables:
+    PG_SERVER_VERSION: "9.6"
+    <<: *extended_image_vars
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
+
+build-extended-postgres-10-image-feature:
+  <<: *build_image_definition
+  <<: *only_feature
+  <<: *extended_image_definition_gl
+  variables:
+    PG_SERVER_VERSION: "10"
+    <<: *extended_image_vars
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
+
+build-extended-postgres-11-image-feature:
+  <<: *build_image_definition
+  <<: *only_feature
+  <<: *extended_image_definition_gl
+  variables:
+    PG_SERVER_VERSION: "11"
+    <<: *extended_image_vars
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
+
+build-extended-postgres-12-image-feature:
+  <<: *build_image_definition
+  <<: *only_feature
+  <<: *extended_image_definition_gl
   variables:
     PG_SERVER_VERSION: "12"
     <<: *extended_image_vars