From 94ddf46ff55d5363e41c220b6692a3b2acf365cc Mon Sep 17 00:00:00 2001 From: Daniel Del Rio Figueira Date: Tue, 16 Feb 2021 19:28:30 +0100 Subject: [PATCH] Changed: add CE and pro builds --- .gitlab-ci/Jobs/build_image.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/Jobs/build_image.yml b/.gitlab-ci/Jobs/build_image.yml index 9d669c2..0c5f156 100644 --- a/.gitlab-ci/Jobs/build_image.yml +++ b/.gitlab-ci/Jobs/build_image.yml @@ -3,6 +3,8 @@ image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] + variables: + COMPONENT: "testing" script: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - | @@ -21,20 +23,42 @@ --destination $CI_REGISTRY_IMAGE:${PASSBOLT_FLAVOUR:-local}-${DOCKER_TAG}-$(date +%s) \ --destination $CI_REGISTRY_IMAGE:${PASSBOLT_FLAVOUR:-local}-${DOCKER_TAG}-latest -build-docker: +build-docker-ce: extends: .build variables: DOCKERFILE_PATH: "debian/Dockerfile" DOCKER_TAG: "root" + PASSBOLT_FLAVOUR: "ce" rules: - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_BRANCH == "develop"' when: on_success -build-rootless: +build-rootless-ce: extends: .build variables: DOCKERFILE_PATH: "debian/Dockerfile.rootless" DOCKER_TAG: "rootless" + PASSBOLT_FLAVOUR: "ce" + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_BRANCH == "develop"' + when: on_success + +build-docker-pro: + extends: .build + variables: + DOCKERFILE_PATH: "debian/Dockerfile" + DOCKER_TAG: "root" + PASSBOLT_FLAVOUR: "pro" + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_BRANCH == "develop"' + when: on_success + +build-rootless-pro: + extends: .build + variables: + DOCKERFILE_PATH: "debian/Dockerfile.rootless" + DOCKER_TAG: "rootless" + PASSBOLT_FLAVOUR: "pro" rules: - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_COMMIT_BRANCH == "develop"' when: on_success