summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab/build.yml4
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3857eb..bee703c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,9 @@
# improved performance.
variables:
DOCKER_DRIVER: overlay2
- GIT_STRATEGY: fetch
GIT_DEPTH: "1"
+ GIT_STRATEGY: fetch
+ LATEST_IMAGE: registry.gitlab.com/gitlab-org/security-products/license-management:latest
MAJOR: 3
TMP_IMAGE: $CI_REGISTRY_IMAGE/license-finder:$CI_COMMIT_SHA
diff --git a/.gitlab/build.yml b/.gitlab/build.yml
index ea543de..6cc7807 100644
--- a/.gitlab/build.yml
+++ b/.gitlab/build.yml
@@ -24,8 +24,8 @@ build-docker-image:
script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker pull registry.gitlab.com/gitlab-org/security-products/license-management:latest $CI_REGISTRY_IMAGE:latest || true
- - docker build --cache-from registry.gitlab.com/gitlab-org/security-products/license-management:latest -t $TMP_IMAGE .
+ - docker pull $LATEST_IMAGE || true
+ - docker build --cache-from $LATEST_IMAGE -t $TMP_IMAGE .
- docker image inspect $TMP_IMAGE --format='{{.Size}}'
- docker push $TMP_IMAGE