diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7573068..29292ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,12 +8,10 @@ stages: variables: IMAGE_NAME: thallian/alpine-s6 -before_script: - - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY - build: stage: build script: + - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA . - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME . - docker build -t $IMAGE_NAME:latest . @@ -27,7 +25,7 @@ trigger: - apk --no-cache add curl - | for TRIGGER in $(echo $TRIGGERS | tr [:space:] ' '); do - trigger_token=(echo $TRIGGER | tr [_] ' ' | awk -v N=1 '{print $N}') - project_id=(echo $TRIGGER | tr [_] ' ' | awk -v N=2 '{print $N}') + trigger_token=$(echo $TRIGGER | tr [_] ' ' | awk -v N=1 '{print $N}') + project_id=$(echo $TRIGGER | tr [_] ' ' | awk -v N=2 '{print $N}') curl -fs -X POST -F ref=master -F token=$trigger_token $CI_API_V4_URL/projects/$project_id/trigger/pipeline > /dev/null done