diff options
| author | mo khan <mo.khan@gmail.com> | 2020-02-20 15:49:05 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-02-20 15:49:05 -0700 |
| commit | 87bc4c78940f28e3dd5a71ca549ae595c41e8351 (patch) | |
| tree | 7dcb9153ab4c07d9d3a83efbfdbc69c6c423a1b4 /.gitlab-ci.yml | |
| parent | dec9ce86354cfc051f3b7b08dcf9474ef5e948a0 (diff) | |
Split the image
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b29663d..c54db43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ 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,14 +22,25 @@ 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 --cache-from $TOOLS_IMAGE -t $TOOLS_IMAGE -f Dockerfile.tools . + - 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 pull $CI_REGISTRY_IMAGE:edge || true - - docker build --cache-from $CI_REGISTRY_IMAGE:edge -t $TMP_IMAGE . + - docker pull $TOOLS_IMAGE || true + - docker build --cache-from $TOOLS_IMAGE --build-arg IMAGE_VERSION=$CI_COMMIT_BRANCH -t $TMP_IMAGE . - docker push $TMP_IMAGE container_scanning: |