diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d15fc3..b4de57a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,12 @@ variables: FQ_IMAGE_NAME: "$CI_REGISTRY_IMAGE" BUILDAH_NO_PROMPT: "1" +workflow: + rules: + - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "schedule"' + when: always + - when: never + stages: - base @@ -15,11 +21,7 @@ build_base: - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:latest -f Dockerfile.base . - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" - buildah push ${FQ_IMAGE_NAME}:latest - rules: - - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "schedule"' - when: always - - when: never include: - "tools/coder-cli/.gitlab-ci.yml" - - "tools/terraform-shell/.gitlab-ci.yml" \ No newline at end of file + - "tools/terraform-shell/.gitlab-ci.yml" diff --git a/tools/coder-cli/.gitlab-ci.yml b/tools/coder-cli/.gitlab-ci.yml index d872056..2d9d0b6 100644 --- a/tools/coder-cli/.gitlab-ci.yml +++ b/tools/coder-cli/.gitlab-ci.yml @@ -5,7 +5,3 @@ build_cli: - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:cli -f tools/coder-cli/Dockerfile . - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" - buildah push ${FQ_IMAGE_NAME}:cli - rules: - - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "schedule"' - when: always - - when: never \ No newline at end of file diff --git a/tools/terraform-shell/.gitlab-ci.yml b/tools/terraform-shell/.gitlab-ci.yml index 7d532e3..e9aa7f1 100644 --- a/tools/terraform-shell/.gitlab-ci.yml +++ b/tools/terraform-shell/.gitlab-ci.yml @@ -5,7 +5,3 @@ build_shell: - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:terraform -f tools/terraform-shell/Dockerfile . - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" - buildah push ${FQ_IMAGE_NAME}:terraform - rules: - - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "schedule"' - when: always - - when: never \ No newline at end of file