Skip to content
Snippets Groups Projects
Commit daa244d5 authored by Fabien FORESTIER's avatar Fabien FORESTIER
Browse files

Merge branch 'development' into 'master'

Adding build tag on build jobs

See merge request !11
parents 6017c1d1 be97f9e3
No related branches found
No related tags found
2 merge requests!22reactive sentinel en develop,!11Adding build tag on build jobs
Pipeline #6866 canceled
...@@ -3,7 +3,7 @@ stages: ...@@ -3,7 +3,7 @@ stages:
- build - build
variables: variables:
SONAR_URL: https://sonarqube.forge.grandlyon.com SONAR_URL: https://sonarqube.forge.grandlyon.com
sonarqube: sonarqube:
stage: sonar-analysis stage: sonar-analysis
...@@ -25,6 +25,8 @@ sonarqube: ...@@ -25,6 +25,8 @@ sonarqube:
build_development: build_development:
stage: build stage: build
tags:
- build
only: only:
- development - development
script: script:
...@@ -34,13 +36,15 @@ build_development: ...@@ -34,13 +36,15 @@ build_development:
- export REDIS_SENTINEL_EXPOSED_PORT=26379 - export REDIS_SENTINEL_EXPOSED_PORT=26379
- export REDIS_SLAVE_PORT=6380 - export REDIS_SLAVE_PORT=6380
- export REDIS_MASTER_PORT=6379 - export REDIS_MASTER_PORT=6379
- docker-compose build - docker-compose build
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
- "curl -X POST -F token=$CI_JOB_TOKEN -F ref=master -F variables[TAG]=${TAG} https://forge.grandlyon.com/api/v4/projects/337/trigger/pipeline" - 'curl -X POST -F token=$CI_JOB_TOKEN -F ref=master -F variables[TAG]=${TAG} https://forge.grandlyon.com/api/v4/projects/337/trigger/pipeline'
build_release: build_release:
stage: build stage: build
tags:
- build
only: only:
- tags - tags
script: script:
...@@ -52,4 +56,4 @@ build_release: ...@@ -52,4 +56,4 @@ build_release:
- export REDIS_MASTER_PORT=6379 - export REDIS_MASTER_PORT=6379
- docker-compose build - docker-compose build
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment