Move docker_build to 'script' level in the CI

This commit is contained in:
Matej Sima 2019-09-25 13:14:41 +02:00
parent af9e6a90b9
commit d1c1f0c08e

View File

@ -51,7 +51,6 @@ stages:
- docker:dind - docker:dind
.docker_build: &docker_build .docker_build: &docker_build
script:
- docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile . - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
.before_script: &before_script .before_script: &before_script
@ -96,8 +95,8 @@ remote-repo-job:
build-current-docker-image: build-current-docker-image:
stage: build_docker stage: build_docker
<<: *docker <<: *docker
<<: *docker_build
script: script:
<<: *docker_build
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
except: except:
- master - master
@ -108,8 +107,8 @@ build-current-docker-image:
build-and-publish-latest-docker-image: build-and-publish-latest-docker-image:
stage: build_and_deploy_docker stage: build_and_deploy_docker
<<: *docker <<: *docker
<<: *docker_build
script: script:
<<: *docker_build
- docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD - docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
- docker push $LIGO_REGISTRY_IMAGE:next - docker push $LIGO_REGISTRY_IMAGE:next