diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1e761d..c2ed383 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: DOCKER_DRIVER: overlay2 MAJOR: 1 - IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA + TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA services: - docker:stable-dind @@ -20,8 +20,8 @@ build commit: script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $IMAGE . - - docker push $IMAGE + - docker build -t $TMP_IMAGE . + - docker push $TMP_IMAGE QA: image: docker:stable @@ -29,8 +29,8 @@ QA: script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $IMAGE - - docker run $IMAGE test + - docker pull $TMP_IMAGE + - docker run $TMP_IMAGE test .docker_tag: image: docker:stable @@ -38,7 +38,7 @@ QA: script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - export SOURCE_IMAGE=$IMAGE + - export SOURCE_IMAGE=$TMP_IMAGE - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - docker pull $SOURCE_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE |