Commit c09ee7ef authored by totte's avatar totte
Browse files

Specify Docker version and CERTDIR for DinD usage

parent 939c1101
......@@ -56,12 +56,14 @@ amd64 image:
tags:
- x86_64
stage: build
image: docker:stable
image: docker:19.03.1
services:
- docker:dind
- docker:19.03.1-dind
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
before_script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
script:
- docker build -t ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}-amd64:$CI_COMMIT_REF_NAME .
......@@ -94,14 +96,15 @@ amd64 unit test:
tags:
- x86_64
stage: test
image: docker:stable
image: docker:19.03.1
services:
- docker:dind
- docker:19.03.1-dind
- postgres:11.2
variables:
DOCKER_DRIVER: overlay2
TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}-amd64:$CI_COMMIT_REF_NAME
SECRET_KEY: $TEST_SECRET_KEY
DOCKER_TLS_CERTDIR: "/certs"
before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- apk add --no-cache py-pip
......@@ -119,14 +122,15 @@ arm unit test:
tags:
- armv71
stage: test
image: docker:stable
image: docker:19.03.1
services:
- docker:dind
- docker:19.03.1-dind
- postgres:11.2
variables:
DOCKER_DRIVER: overlay2
TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}-arm:$CI_COMMIT_REF_NAME
SECRET_KEY: $TEST_SECRET_KEY
DOCKER_TLS_CERTDIR: "/certs"
before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- apk add --no-cache py-pip
......@@ -144,11 +148,12 @@ release:
tags:
- armv71
stage: release
image: docker:stable
image: docker:19.03.1
services:
- docker:dind
- docker:19.03.1-dind
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
before_script:
- export DOCKER_CLI_EXPERIMENTAL=enabled
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment