diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30025921cbc531ab0a6a8dfce83b2b1c57bcf780..7b22a9df94c643a7d40fc28e71a3c8097e76b120 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ api publish: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --context ${CI_PROJECT_DIR}/docker --dockerfile $CI_PROJECT_DIR/docker/dockerfile_trefle --build-arg TREFLE_VERSION=$CI_COMMIT_TAG --build-arg TREFLE_GIT=${CI_PROJECT_URL} --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} only: - - /^api-v[0-9.]+$/ + - /^api-v[0-9.ab]+$/ - /^testing$/ deploy API to staging: @@ -49,7 +49,7 @@ deploy API to staging: script: - ssh gitlab@${STAGING_SERVEUR_IP} "cd /home/docker && VERSION=${CI_COMMIT_TAG} /bin/bash update.sh trefle && echo \"VERSION=${CI_COMMIT_TAG}\" | tee -a update.log >> .env" only: - - /^api-v[0-9.]+$/ + - /^api-v[0-9.ab]+$/ - /^testing$/ backoffice publish: @@ -61,7 +61,7 @@ backoffice publish: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --context ${CI_PROJECT_DIR}/docker --dockerfile ${CI_PROJECT_DIR}/docker/dockerfile_web --build-arg TREFLE_BACK_VERSION=${CI_COMMIT_TAG} --build-arg TREFLE_OLD_VERSION=${TREFLE_OLD_VERSION} --build-arg TREFLE_GIT=${CI_PROJECT_URL} --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} only: - - /^backoffice-v[0-9.]+$/ + - /^backoffice-v[0-9.ab]+$/ deploy Backoffice to staging: type: deploy @@ -80,5 +80,5 @@ deploy Backoffice to staging: script: - ssh gitlab@${STAGING_SERVEUR_IP} "cd /home/docker && BACK_VERSION=${CI_COMMIT_TAG} docker-compose up -d --no-deps web && echo \"BACK_VERSION=${CI_COMMIT_TAG}\" | tee -a .env >> update.log" only: - - /^backoffice-v[0-9.]+$/ + - /^backoffice-v[0-9.ab]+$/ - /^testing$/