feat: improved docker images storage

astansler · NikolayS · commit f20a36f84ed5 · 2020-05-15T14:59:09.000Z
diff --git a/.ci/docker_build_push.sh b/.ci/docker_build_push.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -euo pipefail
+
+docker_file=${DOCKER_FILE:-"Dockerfile"}
+tags=${TAGS:-""}
+
+registry_user=${REGISTRY_USER:-"${CI_REGISTRY_USER}"}
+registry_password=${REGISTRY_PASSWORD:-"${CI_REGISTRY_PASSWORD}"}
+registry=${REGISTRY:-"${CI_REGISTRY}"}
+
+docker login --username $registry_user --password "${registry_password}" $registry
+
+tags_build=""
+tags_push=""
+
+IFS=',' read -ra ADDR string <<EOF
+$tags
+EOF
+
+for tag in "${ADDR[@]}"; do
+  tags_build="${tags_build} --tag ${tag}"
+  tags_push="${tags_push}${tag}\n"
+done
+
+set -x
+docker build $tags_build --file $docker_file .
+set +x
+
+echo -e "$tags_push" | while read -r tag; do
+  [ -z "$tag" ] && continue
+  set -x
+  docker push $tag
+  set +x
+done
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,7 +2,13 @@ image: ubuntu:16.04
 
 stages:
   - test
-  - docker_build
+  - build-image
+
+workflow:
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+      when: never
+    - when: always
 
 variables:
   POSTGRES_DB: dbname # set database
@@ -194,44 +200,67 @@ test-check-cli:
       exit 1
     fi
 
-
-Docker build master:
-  image: docker:stable
-  stage: docker_build
-  when: on_success
-  variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_HOST: tcp://docker:2375
-  only:
-    - master
-    - docker_build
-    - docker_run_checkup_with_upload
+.job_template: &build_image_definition
+  image: docker:19
+  stage: build-image
+  artifacts:
+    paths:
+      - bin
   services:
     - docker:dind
-  before_script:
-    - docker login -u gitlab-ci-token -p "${CI_BUILD_TOKEN}" registry.gitlab.com
   script:
-    - docker build -t registry.gitlab.com/postgres-ai/postgres-checkup:latest --no-cache=true .
-    - docker push registry.gitlab.com/postgres-ai/postgres-checkup:latest
-  after_script:
-    - docker logout registry.gitlab.com
-
-Docker build for tag:
-  image: docker:stable
-  stage: docker_build
-  when: on_success
+    - apk update && apk upgrade && apk add --no-cache bash # TODO(anatoly): Remove dependency.
+    - bash ./.ci/docker_build_push.sh
+
+.only_var_template: &only_tag_release
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^[0-9.]+$/
+
+.only_var_template: &only_tag_rc
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^[0-9.]+[\-_]*[a-zA-Z]+[a-zA-Z0-9.\-_]*[a-zA-Z0-9]+$/
+
+.only_var_template: &only_master
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+
+.only_var_template: &only_feature
+  rules:
+    - if: $CI_COMMIT_REF_SLUG != "master" #$CI_COMMIT_REF_SLUG && 
+
+build-image-feature-server:
+  <<: *build_image_definition
+  <<: *only_feature
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_HOST: tcp://docker:2375
-  only:
-    variables:
-      - $CI_COMMIT_TAG != null
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u gitlab-ci-token -p "${CI_BUILD_TOKEN}" registry.gitlab.com
-  script:
-    - docker build -t registry.gitlab.com/postgres-ai/postgres-checkup:$CI_COMMIT_TAG --no-cache=true .
-    - docker push registry.gitlab.com/postgres-ai/postgres-checkup:$CI_COMMIT_TAG
-  after_script:
-    - docker logout registry.gitlab.com
+    REGISTRY_USER: "${CI_REGISTRY_USER}"
+    REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
+    REGISTRY: "${CI_REGISTRY}"
+    DOCKER_NAME: "registry.gitlab.com/postgres-ai/postgres-checkup"
+    TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
+
+build-image-master-server:
+  <<: *build_image_definition
+  <<: *only_master
+  variables:
+    DOCKER_NAME: "registry.gitlab.com/postgres-ai/postgres-checkup"
+    TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
+
+build-image-latest-server:
+  <<: *build_image_definition
+  <<: *only_tag_release
+  variables:
+    REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
+    REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
+    REGISTRY: "${DH_CI_REGISTRY}"
+    DOCKER_NAME: "postgresai/postgres-checkup"
+    TAGS: "${DOCKER_NAME}:latest,${DOCKER_NAME}:${CI_COMMIT_TAG}"
+
+build-image-rc-server:
+  <<: *build_image_definition
+  <<: *only_tag_rc
+  variables:
+    REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
+    REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
+    REGISTRY: "${DH_CI_REGISTRY}"
+    DOCKER_NAME: "postgresai/postgres-checkup"
+    TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
