diff options
| author | mo khan <mo.khan@gmail.com> | 2020-03-04 12:50:07 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-03-04 12:50:07 -0700 |
| commit | 9eb2b48ee42a340fb231a240b3f451eb5ff8f810 (patch) | |
| tree | e2261eed43f19d5966ffd8913e4524a9ec146e6e /.gitlab-ci.yml | |
| parent | b0b72800e6a7f06ac1956835c78351eea526f25d (diff) | |
Remove TOOLS_IMAGE
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 026b6ac..f7d8bcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: DOCKER_DRIVER: overlay2 MAJOR: 1 TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA - TOOLS_IMAGE: $CI_REGISTRY_IMAGE/tools:$CI_COMMIT_BRANCH include: - template: Container-Scanning.gitlab-ci.yml @@ -21,25 +20,13 @@ stages: - tag - release -tools: - image: docker:stable - stage: .pre - variables: - script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $TOOLS_IMAGE || true - - docker build -t $TOOLS_IMAGE -f Dockerfile.tools . - - docker image inspect $TOOLS_IMAGE --format='{{.Size}}' - - docker push $TOOLS_IMAGE - build commit: image: docker:stable stage: build script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build --build-arg TOOLS_IMAGE=$TOOLS_IMAGE -t $TMP_IMAGE . + - docker build -t $TMP_IMAGE . - docker image inspect $TMP_IMAGE --format='{{.Size}}' - docker push $TMP_IMAGE |