From 7db3bf8fb5e0c4ae87998875a236fcbe04b82d4c Mon Sep 17 00:00:00 2001 From: Steve Reis <stevereis93@gmail.com> Date: Fri, 10 Sep 2021 14:17:54 +0000 Subject: [PATCH] Remove release part as it's the same as the build stage --- .gitlab-ci.yml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69bd660..dcc1951 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,8 @@ stages: - deploy variables: - CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest + CONTAINER_BASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:stable CONTAINER_QA_IMAGE: $CI_REGISTRY_IMAGE:nightly before_script: @@ -18,27 +18,9 @@ before_script: build: stage: build script: - - docker build -t $CONTAINER_TEST_IMAGE ./api - - docker push $CONTAINER_TEST_IMAGE + - docker build --pull -t $CONTAINER_BASE_IMAGE . + - docker push $CONTAINER_BASE_IMAGE only: - main - develop - /^release-.*$/ - -release_prod: - stage: release - script: - - docker pull $CONTAINER_TEST_IMAGE - - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - - docker push $CONTAINER_RELEASE_IMAGE - only: - - main - -release_qa: - stage: release - script: - - docker pull $CONTAINER_TEST_IMAGE - - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - - docker push $CONTAINER_QA_IMAGE - only: - - develop -- GitLab