From bae236298040d7d660876c8b0d4edae0d64d202b Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 9 Feb 2022 10:59:58 +0000
Subject: [PATCH] feat(cicd): rework on automation. Add feature and tag build.
Better handling of dependencie proxy
---
.gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a10231ea2..ca4cc60ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,19 @@ stages:
- build
- deploy
+default:
+ services:
+ - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09-dind
+ alias: docker
+
+variables:
+ DOCKER_TLS_CERTDIR: ''
+ DOCKER_HOST: tcp://docker:2375/
+ DOCKER_DRIVER: overlay2
+ DEPENDENCY_PROXY: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/
+
build:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
- services:
- - docker:18.09-dind
only:
- dev
- rec
@@ -18,6 +27,30 @@ build:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+build_branch:
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
+ stage: build
+ except:
+ - master
+ - rec
+ - dev
+ script:
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/feat:$CI_COMMIT_REF_SLUG" --build-arg conf=prod .
+ - docker push "$CI_REGISTRY_IMAGE/feat:$CI_COMMIT_REF_SLUG"
+
+build-release:
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
+ services:
+ - ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/:18.09-dind
+ stage: build
+ only:
+ - tags
+ script:
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/tags:$CI_COMMIT_TAG" --build-arg conf=prod .
+ - docker push "$CI_REGISTRY_IMAGE/tags:$CI_COMMIT_TAG"
+
deploy_dev:
stage: deploy
tags:
@@ -85,8 +118,6 @@ test:
mr:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
- services:
- - docker:18.09-dind
stage: build
only:
- merge_requests
--
GitLab