Attempt to fix docker_build CI config

This commit is contained in:
Matej Sima 2019-09-25 13:19:44 +02:00
parent d1c1f0c08e
commit d9afee0fad

View File

@ -50,8 +50,6 @@ stages:
services: services:
- docker:dind - docker:dind
.docker_build: &docker_build
- docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
.before_script: &before_script .before_script: &before_script
before_script: before_script:
@ -96,7 +94,7 @@ build-current-docker-image:
stage: build_docker stage: build_docker
<<: *docker <<: *docker
script: script:
<<: *docker_build - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
except: except:
- master - master
@ -108,9 +106,9 @@ build-and-publish-latest-docker-image:
stage: build_and_deploy_docker stage: build_and_deploy_docker
<<: *docker <<: *docker
script: script:
<<: *docker_build - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
- docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
- docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
- docker push $LIGO_REGISTRY_IMAGE:next - docker push $LIGO_REGISTRY_IMAGE:next
only: only:
- dev - dev