From caf5b79cf71d98ae212b595542723392b104486d Mon Sep 17 00:00:00 2001
From: Benjamin GUILLON <benjamin.guillon@cc.in2p3.fr>
Date: Thu, 2 Apr 2020 14:44:55 +0200
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61f20786..5eae67d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,35 +2,39 @@ stages:
- build
- test
-nginx-image-build:
- stage: build
- before_script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- image: docker:latest
+default:
services:
- - docker:dind
- script:
- - docker build --pull -t "$CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG" -f ./docker/nginx/Dockerfile .
- - docker push "$CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG"
+ - docker:dind
+ image: docker:latest
php-image-build:
stage: build
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- image: docker:latest
- services:
- - docker:dind
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE/php-fpm:$CI_COMMIT_REF_SLUG" -f ./docker/php-fpm/Dockerfile .
- docker push "$CI_REGISTRY_IMAGE/php-fpm:$CI_COMMIT_REF_SLUG"
+nginx-image-build:
+ stage: build
+ before_script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ needs:
+ - php-image-build
+ script:
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG" -f ./docker/nginx/Dockerfile .
+ - docker push "$CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG"
+
test:
stage: test
image: $CI_REGISTRY_IMAGE/php-fpm:$CI_COMMIT_REF_SLUG
+ variables:
+ # Don't git clone, the software is already in the image run
+ GIT_STRATEGY: none
needs:
- php-image-build
script:
- - ls -la .
- - cd $CI_BUILD_DIR && sh ./vendor/bin/simple-phpunit --configuration phpunit.xml.dist
+ - pwd && ls -la .
+ - sh .tms/vendor/bin/simple-phpunit --configuration phpunit.xml.dist
## TODO: Define unit tests
## TODO: Add unit tests report as job artifact
--
GitLab