diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8e1777ace92b8ddc041c0c568454886133da74a..5eb1de4fdf7937f6a3aad9ad0eb9ee9e4dbc3317 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ build main: extends: .build script: - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} || true - - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} + - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true - docker build -t ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} . - docker push ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} timeout: 2h @@ -79,7 +79,7 @@ build dockerfile: extends: .build script: - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} || true - - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} + - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true - docker build -t ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} -f ${DOCKERFILE} . - docker push ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} resource_group: build_containers