Update .gitlab-ci.yml
This commit is contained in:
parent
75c1e60094
commit
77c834df35
@ -10,15 +10,11 @@
|
|||||||
# This file is a template, and might need editing before it works on your project.
|
# This file is a template, and might need editing before it works on your project.
|
||||||
docker-build:
|
docker-build:
|
||||||
# Official docker image.
|
# Official docker image.
|
||||||
image: python:3.6.5
|
image: docker:20.10.5
|
||||||
variables:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
before_script:
|
before_script:
|
||||||
- *install_docker
|
|
||||||
- docker info
|
- docker info
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
@ -29,15 +25,11 @@ docker-build:
|
|||||||
|
|
||||||
docker-build-master:
|
docker-build-master:
|
||||||
# Official docker image.
|
# Official docker image.
|
||||||
image: python:3.6.5
|
image: docker:20.10.5
|
||||||
variables:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
before_script:
|
before_script:
|
||||||
- *install_docker
|
|
||||||
- docker info
|
- docker info
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
|
|||||||
Reference in New Issue
Block a user