diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eaaaeea..2691446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ build-all: script: - 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} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT} - - docker push + - docker push ${DOCKER_NS}:${DOCKER_TAG} .docker-release: image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest @@ -38,7 +38,7 @@ build-all: stage: docker-release variables: 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} only: - main - develop