use-docker host dns for CI

This commit is contained in:
Antoine Legrand 2017-06-26 15:21:59 +02:00
parent dc2e7caabe
commit e514362394
3 changed files with 15 additions and 17 deletions

View file

@ -13,6 +13,7 @@ local stages_list = [
'docker_release',
'teardown',
];
local stages = utils.set(stages_list);
// List CI jobs

View file

@ -11,13 +11,12 @@ container-base-build:
script:
- docker build --cache-from quay.io/quay/quay-base:latest -t quay.io/quay/quay-base:latest -f quay-base.dockerfile .
- docker push quay.io/quay/quay-base:latest
services:
- docker:dind
stage: docker_base
tags:
- docker
- kubernetes
variables:
DOCKER_DRIVER: aufs
DOCKER_DRIVER: overlay
DOCKER_HOST: tcp://docker-host.gitlab-runner.svc.cluster.local:2375
container-build:
before_script:
- docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
@ -25,13 +24,12 @@ container-build:
script:
- docker build -t quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG} -f quay.dockerfile .
- docker push quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG}
services:
- docker:dind
stage: docker_build
tags:
- docker
- kubernetes
variables:
DOCKER_DRIVER: aufs
DOCKER_DRIVER: overlay
DOCKER_HOST: tcp://docker-host.gitlab-runner.svc.cluster.local:2375
container-release:
before_script:
- docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
@ -43,13 +41,12 @@ container-release:
- docker pull quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG}
- docker tag quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG} quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}
- docker push quay.io/quay/quay-ci:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}
services:
- docker:dind
stage: docker_release
tags:
- docker
- kubernetes
variables:
DOCKER_DRIVER: aufs
DOCKER_DRIVER: overlay
DOCKER_HOST: tcp://docker-host.gitlab-runner.svc.cluster.local:2375
karma-tests:
before_script:
- cd /

View file

@ -3,17 +3,17 @@ function(vars={})
dockerBuild: {
// base job to manage containers (build / push)
variables: {
DOCKER_DRIVER: "aufs",
DOCKER_DRIVER: "overlay",
DOCKER_HOST: "tcp://docker-host.gitlab-runner.svc.cluster.local:2375"
},
image: "docker:git",
before_script: [
"docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io",
],
services: [
"docker:dind",
],
tags: [
"docker",
"kubernetes",
],
},