Fix docker build

This commit is contained in:
saibotk 2020-01-08 11:11:30 +01:00
parent 837a1bf260
commit 687a76455b
No known key found for this signature in database
GPG key ID: A3299C587D5DF523

View file

@ -1,4 +1,5 @@
image: ubuntu:bionic # Official docker image.
image: docker:19.03.1
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
@ -39,9 +40,10 @@ build:
package-deploy: package-deploy:
stage: package stage: package
services: services:
- docker:dind - docker:19.03.1-dind
variables: variables:
DOCKER_HOST: "tcp://docker:2375" DOCKER_HOST: "tcp://docker:2375"
DOCKER_TLS_CERTDIR: ""
LANG: C.UTF-8 LANG: C.UTF-8
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@ -59,6 +61,7 @@ package:
- docker:dind - docker:dind
variables: variables:
DOCKER_HOST: "tcp://docker:2375" DOCKER_HOST: "tcp://docker:2375"
DOCKER_TLS_CERTDIR: ""
LANG: C.UTF-8 LANG: C.UTF-8
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY