sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI updates #2

Browse source
This commit is contained in:
Darren Clarke 2023-06-20 08:39:14 +00:00 • committed by GitHub
parent ea51cf6ef1
commit da274d3c66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -18,11 +18,11 @@ build-all:
- docker:dind - docker:dind
stage: docker-build stage: docker-build
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/$(basename "${PWD}")
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
DOCKER_CONTEXT: .
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} ${PWD} - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
- docker push - docker push
.docker-release: .docker-release:
@ -31,7 +31,6 @@ build-all:
- docker:dind - docker:dind
stage: docker-release stage: docker-release
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/$(basename "${PWD}")
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}-$(shell jq -r '.version' package.json) DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}-$(shell jq -r '.version' package.json)
only: only:
@ -49,6 +48,7 @@ link-docker-build:
- cd apps/link - cd apps/link
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
DOCKERFILE_PATH: apps/link/Dockerfile
link-docker-release: link-docker-release:
extends: .docker-release extends: .docker-release