Merge branch 'fix-ci-config' into 'master'

fix: CI config deploy to docker hub

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

Author: anatolystansler

extended/build-images-ci.yml

@@ -1,4 +1,7 @@
-.job_template: &build_image_definition
+stages:
+  - build-image
+
+.job_template: &build_image_definition_dh
   image: docker:19
   stage: build-image
   services:
@@ -7,104 +10,102 @@
   script:
     - apk add --no-cache bash
     - bash ./ci_docker_build_push.sh
-
-.only_var_template: &only_tag_release
-  only:
-    variables:
-      - $CI_COMMIT_TAG =~ /^[0-9.]+$/
-
-.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
+.job_template: &build_image_definition_gl
+  image: docker:19
+  stage: build-image
+  services:
+    - alias: docker
+      name: docker:19.03.5-dind
+  script:
+    - apk add --no-cache bash
+    - bash ./ci_docker_build_push.sh
   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"
 
+.only_var_template: &only_tag_release
+  only:
+    variables:
+      - $CI_COMMIT_TAG =~ /^[0-9.]+$/
+
+.only_var_template: &only_feature
+  only:
+    refs:
+      - branches
+    variables:
+      - $CI_COMMIT_REF_SLUG != "master"
+  when: manual
+
 build-extended-postgres-9-6-image-latest:
-  <<: *build_image_definition
+  <<: *build_image_definition_dh
   <<: *only_tag_release
-  <<: *extended_image_definition_dh
   variables:
-    PG_SERVER_VERSION: "9.6"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "9.6"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-10-image-latest:
-  <<: *build_image_definition
+  <<: *build_image_definition_dh
   <<: *only_tag_release
-  <<: *extended_image_definition_dh
   variables:
-    PG_SERVER_VERSION: "10"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "10"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-11-image-latest:
-  <<: *build_image_definition
+  <<: *build_image_definition_dh
   <<: *only_tag_release
-  <<: *extended_image_definition_dh
   variables:
-    PG_SERVER_VERSION: "11"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "11"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-12-image-latest:
-  <<: *build_image_definition
+  <<: *build_image_definition_dh
   <<: *only_tag_release
-  <<: *extended_image_definition_dh
   variables:
-    PG_SERVER_VERSION: "12"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "12"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-9-6-image-feature:
-  <<: *build_image_definition
+  <<: *build_image_definition_gl
   <<: *only_feature
-  <<: *extended_image_definition_gl
   variables:
-    PG_SERVER_VERSION: "9.6"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "9.6"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-10-image-feature:
-  <<: *build_image_definition
+  <<: *build_image_definition_gl
   <<: *only_feature
-  <<: *extended_image_definition_gl
   variables:
-    PG_SERVER_VERSION: "10"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "10"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-11-image-feature:
-  <<: *build_image_definition
+  <<: *build_image_definition_gl
   <<: *only_feature
-  <<: *extended_image_definition_gl
   variables:
-    PG_SERVER_VERSION: "11"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "11"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
 build-extended-postgres-12-image-feature:
-  <<: *build_image_definition
+  <<: *build_image_definition_gl
   <<: *only_feature
-  <<: *extended_image_definition_gl
   variables:
-    PG_SERVER_VERSION: "12"
     <<: *extended_image_vars
+    PG_SERVER_VERSION: "12"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"