fix ci script

This commit is contained in:
2021-01-19 10:57:06 +01:00
parent 3f88cf0bf9
commit 7515dfcdea

View File

@ -4,7 +4,7 @@ stages:
- dockerize - dockerize
variables: variables:
IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH} IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
build: build:
image: node:14-buster image: node:14-buster
@ -31,12 +31,12 @@ check:
- linux - linux
- docker - docker
rules: rules:
- if: ${CI_COMMIT_TAG} - if: $CI_COMMIT_TAG
script: script:
- checksemver.py -v - checksemver.py -v
--versionToValidate "${CI_COMMIT_TAG}" --versionToValidate "$CI_COMMIT_TAG"
--validateMessage --validateMessage
--messageToValidate "${CI_COMMIT_MESSAGE}" --messageToValidate "$CI_COMMIT_MESSAGE"
dockerize: dockerize:
image: registry.hottis.de/dockerized/docker-bash:latest image: registry.hottis.de/dockerized/docker-bash:latest
@ -45,8 +45,10 @@ dockerize:
- hottis - hottis
- linux - linux
- docker - docker
rules:
- if: $CI_COMMIT_TAG
script: script:
- docker build --tag ${IMAGE_NAME}:latest --tag ${IMAGE_NAME}:$CI_COMMIT_TAG} . - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG .
- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push ${IMAGE_NAME}:latest - docker push $IMAGE_NAME:latest
- docker push ${IMAGE_NAME}:$CI_COMMIT_TAG} - docker push $IMAGE_NAME:$CI_COMMIT_TAG