diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91239ea3..d94e835b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ before_script: - RELEASE=$(echo $CI_COMMIT_REF_NAME | sed "s{.*\/\(.*\)\/.*{\1{g") - RELEASE_DATE="$(date '+%Y-%m-%d')" - IMAGE_TAG=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g") + - IMAGE_TAG_DATE:"${IMAGE_TAG}-${RELEASE_DATE" - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com merge_request: @@ -53,7 +54,7 @@ release: - docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow - docker run -v "${PWD}/.local:/dest" flow self-install /dest - cd .local/flow - - ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG:$RELEASE_DATE + - ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG_DATE only: - /^\d+\.\d+$/