Update .gitlab-ci.yml
This commit is contained in:
parent
e7906d1566
commit
cf9a6e3538
@ -1,16 +1,23 @@
|
|||||||
|
.install_docker: &install_docker |
|
||||||
|
apt-get update
|
||||||
|
apt-get -y install apt-transport-https ca-certificates curl software-properties-common
|
||||||
|
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
|
||||||
|
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
|
||||||
|
apt-get update
|
||||||
|
apt-get -y install docker-ce
|
||||||
|
|
||||||
# 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: docker:20.10.6
|
image: python:3.6.5
|
||||||
variables:
|
variables:
|
||||||
DOCKER_HOST: tcp://docker:2375
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
services:
|
|
||||||
- docker:20.10.6-dind
|
|
||||||
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:
|
||||||
@ -21,16 +28,15 @@ docker-build:
|
|||||||
|
|
||||||
docker-build-master:
|
docker-build-master:
|
||||||
# Official docker image.
|
# Official docker image.
|
||||||
image: docker:20.10.6
|
image: python:3.6.5
|
||||||
variables:
|
variables:
|
||||||
DOCKER_HOST: tcp://docker:2375
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
services:
|
|
||||||
- docker:20.10.6-dind
|
|
||||||
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