Skip to content
Snippets Groups Projects
Commit c789b57d authored by Chris Pastl's avatar Chris Pastl
Browse files

Revert "refactor(DOCKER): Use main tag and main-commit-sha for pushing to docker hub"

This reverts commit 4a587f8f.
parent 39f16cf1
No related branches found
No related tags found
1 merge request!39Fix docker image names for release
...@@ -209,23 +209,19 @@ docker-push: ...@@ -209,23 +209,19 @@ docker-push:
- docker:dind - docker:dind
script: script:
# every commit on main branch should build and push image as unstable # every commit on main branch should build and push image as unstable
# elseif its a protected branch and push to gitlab registry # elseif its a feature branch build and push to gitlab registry
# else it is from a tag (enforced by gitlab-ci rules) # else it is from a tag (enforced by gitlab-ci rules)
# hint: tags are references independent of branches # hint: tags are references independent of branches
# hint: feature branches must begin with "feat" # hint: feature branches must begin with "feat"
- | - |
if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ] if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
then docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" then docker build -t $AURA_IMAGE_NAME:unstable .
docker build -t $AURA_IMAGE_NAME:main -t $AURA_IMAGE_NAME:main-$CI_COMMIT_SHORT_SHA . docker push $AURA_IMAGE_NAME:unstable
docker push --all-tags $AURA_IMAGE_NAME elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
elif [ "$CI_COMMIT_REF_PROTECTED" = "true" ] && [ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ] then docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
then docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" docker push $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA . else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
else
docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
fi fi
rules: rules:
- *release-rules - *release-rules
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment