sporada/ocr
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/ocr.git synced 2025-10-31 13:42:44 +00:00
Code Issues Projects Releases Wiki Activity

Change intermediate image name in order to fix issues with building multiple branches/tags at the same time

Browse Source
This commit is contained in:
Patrick Jentsch
2021-03-15 14:11:23 +01:00
parent acbf61be05
commit 947658a7d8
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@@ -1,8 +1,5 @@
image: docker:19.03.13 image: docker:19.03.13
variables:
DOCKER_TLS_CERTDIR: "/certs"
services: services:
- docker:19.03.13-dind - docker:19.03.13-dind
@@ -10,6 +7,10 @@ stages:
- build - build
- push - push
variables:
DOCKER_TLS_CERTDIR: "/certs"
INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
.reg_setup: .reg_setup:
before_script: before_script:
- apk add --no-cache curl - apk add --no-cache curl
@@ -28,8 +29,6 @@ build_image:
stage: build stage: build
tags: tags:
- docker - docker
variables:
INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
push_master: push_master:
extends: extends:
@@ -47,7 +46,6 @@ push_master:
- docker - docker
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:latest IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
push_other: push_other:
extends: extends:
@@ -68,4 +66,3 @@ push_other:
- docker - docker
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA