Commit a0b0635b authored by Sascha Pfeiffer's avatar Sascha Pfeiffer

fixing docker dind

parent 3bdc3e8f
......@@ -50,7 +50,7 @@ build-docker-image:
stage: build
image: psono-docker.jfrog.io/ubuntu:16.04
services:
- docker:dind
- docker:18-dind
variables:
DOCKER_HOST: 'tcp://docker:2375'
script:
......@@ -160,7 +160,7 @@ release-docker:
stage: release
image: psono-docker.jfrog.io/docker:git
services:
- docker:dind
- docker:18-dind
script:
- docker info
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
......@@ -177,7 +177,7 @@ release-docker:
# stage: deploy
# image: psono-docker.jfrog.io/docker:git
# services:
# - docker:dind
# - docker:18-dind
# script:
# - docker info
# - echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
......@@ -193,7 +193,7 @@ deploy-docker:
stage: deploy
image: psono-docker.jfrog.io/docker:git
services:
- docker:dind
- docker:18-dind
script:
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
- echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
......@@ -211,7 +211,7 @@ deploy-github:
stage: deploy
image: psono-docker.jfrog.io/docker:git
services:
- docker:dind
- docker:18-dind
script:
- sh ./var/deploy-github.sh
environment:
......
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