From 251572cf2c4cd372a56171925bf2e7bd055f475d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org> Date: Thu, 18 Jul 2019 11:25:27 +0200 Subject: [PATCH] ci --- .gitlab-ci.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff992f2..b850b50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,27 +44,29 @@ variables: DOCKER_DRIVER: overlay2 services: - - docker:dind + - docker:dind stages: - - setup - - test + - setup + - test test: + tags: [docker] image: docker:latest script: - docker-compose -f .docker/docker-compose.yml up build-testenv: - image: docker:latest - stage: setup - script: - - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # use here general latest or specific branch latest... - - docker pull $CI_REGISTRY_IMAGE:latest || true - - docker build - --pull - --file .dockerfile - --cache-from $CI_REGISTRY_IMAGE:latest - -t $CI_REGISTRY_IMAGE:latest . - - docker push $CI_REGISTRY_IMAGE:latest + tags: [docker] + image: docker:latest + stage: setup + script: + - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + # use here general latest or specific branch latest... + - docker pull $CI_REGISTRY_IMAGE:latest || true + - docker build + --pull + --file .dockerfile + --cache-from $CI_REGISTRY_IMAGE:latest + -t $CI_REGISTRY_IMAGE:latest . + - docker push $CI_REGISTRY_IMAGE:latest -- GitLab