diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-02 10:21:12 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-03 18:26:45 +0300 |
| commit | 8e18030b0312b1a5f4d7dfe305690e6b9c09cea8 (patch) | |
| tree | 95c768a090e0775fe8647cc10d8d89f71addb6ff /.gitlab-ci.yml | |
| parent | 2a894cfeaefd359edc37182508cae2219612eabd (diff) | |
Dockerfile: Make sure that we use correct base image
Correct one = the one tagged with current commit, so in case of parallel
pipelines we don't take the wrong "latest".
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df2b5f55..c5611138 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,8 @@ build-containers:build-debian: script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian-minimal build-debian-minimal + - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:commit-$CI_COMMIT_SHA + - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:commit-$CI_COMMIT_SHA build-debian-minimal:commit-$CI_COMMIT_SHA - .gitlab-ci/pull-or-rebuild.sh Dockerfile.build-debian build-debian build-containers:build-debian-armhf: @@ -293,5 +295,5 @@ containers:igt: script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA - - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA build-fedora + - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/build-fedora:commit-$CI_COMMIT_SHA build-fedora:commit-$CI_COMMIT_SHA - .gitlab-ci/pull-or-rebuild.sh Dockerfile igt |