From eca1dd8bac8732653e3fa3a79b1d943a08b57117 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sat, 22 Dec 2018 11:46:57 -0800 Subject: [PATCH] Unify triggers. --- .gitlab-ci.yml | 28 +++------------------------- Dockerfile-GitLab | 2 +- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79a6bcc2..80f20de4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,34 +23,12 @@ before_script: build: stage: build script: + - sed -i "s/RELEASE/$RELEASE/g" Dockerfile-GitLab - docker build --pull -t $CONTAINER_IMAGE:$RELEASE -f Dockerfile-GitLab . - docker push $CONTAINER_IMAGE:$RELEASE -trigger11: +trigger: stage: trigger script: - - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=11.0 $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline - only: - - "11.0" - -trigger11-test: - stage: trigger - script: - - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=11.0-test $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline - only: - - 11.0-test - -trigger12: - stage: trigger - script: - - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=12.0 $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline - only: - - "12.0" - -trigger12-test: - stage: trigger - script: - - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=12.0-test $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline - only: - - 12.0-test + - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=$RELEASE $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab index be5bb84d..17df09f1 100644 --- a/Dockerfile-GitLab +++ b/Dockerfile-GitLab @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:11.0 +FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE COPY --chown=104 . /opt/odoo/hibou-suite RUN rm /etc/odoo/odoo.conf \