cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use images in the next steps

Browse source
This commit is contained in:
Cyryl Płotnicki 2019-01-20 16:45:35 +00:00
parent c230d0f28a
commit c3914371f1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -4,7 +4,6 @@ image:fedora:
services: services:
- docker:dind - docker:dind
before_script: before_script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
script: script:
- docker pull $CONTAINER_IMAGE:latest || true - docker pull $CONTAINER_IMAGE:latest || true
@ -22,7 +21,6 @@ image:ubuntu:
services: services:
- docker:dind - docker:dind
before_script: before_script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
script: script:
- docker pull $CONTAINER_IMAGE:latest || true - docker pull $CONTAINER_IMAGE:latest || true
@ -37,13 +35,14 @@ image:ubuntu:
fedora: fedora:
before_script: before_script:
- apk add bash - apk add bash
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
script: ./test.sh script: ./test.sh
image: docker:stable image: docker:stable
services: services:
- docker:dind - docker:dind
variables: variables:
DETECTED_OS: fedora:29 DETECTED_OS: fedora:29
DOCKER_IMAGE: cyplo/fedora29_base DOCKER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH/fedora:latest
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
dependencies: dependencies:
@ -52,13 +51,14 @@ fedora:
ubuntu: ubuntu:
before_script: before_script:
- apk add bash - apk add bash
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
script: ./test.sh script: ./test.sh
image: docker:stable image: docker:stable
services: services:
- docker:dind - docker:dind
variables: variables:
DETECTED_OS: ubuntu:cosmic DETECTED_OS: ubuntu:cosmic
DOCKER_IMAGE: cyplo/cosmic_base DOCKER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH/ubuntu:latest
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
dependencies: dependencies: