Merge branch 'fix-ci' into 'main'

Rename CI token variable

See merge request fablab/labsync!79
This commit is contained in:
jalr 2023-07-13 02:13:56 +00:00
commit 23529c78d9

View file

@ -23,7 +23,7 @@ dockerimage_builder:
- docker:dind - docker:dind
script: script:
- docker pull $DOCKER_IMAGE_BUILDER || true - docker pull $DOCKER_IMAGE_BUILDER || true
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- make builderimg - make builderimg
- docker push $DOCKER_IMAGE_BUILDER - docker push $DOCKER_IMAGE_BUILDER
tags: tags:
@ -41,7 +41,7 @@ dockerimage_security_scanner:
- docker:dind - docker:dind
script: script:
- docker pull $DOCKER_IMAGE_SECURITY_SCANNER || true - docker pull $DOCKER_IMAGE_SECURITY_SCANNER || true
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- make secscanimg - make secscanimg
- docker push $DOCKER_IMAGE_SECURITY_SCANNER - docker push $DOCKER_IMAGE_SECURITY_SCANNER
tags: tags: