Skip to content
Snippets Groups Projects
Commit 52ea8a6e authored by Kay Effenberger's avatar Kay Effenberger
Browse files

FIX(ci)

parent cae79b61
Branches
Tags
1 merge request!16FEAT(gitlab-ci):Push from Feature Branch
Pipeline #3185 failed
Stage: release
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 6 deletions
.gitlab-ci.yml
+ 3
− 6
View file @ 52ea8a6e
...@@ -51,15 +51,12 @@ docker-push: ...@@ -51,15 +51,12 @@ docker-push:
- | - |
if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ] if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
then then
docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME:unstable .
docker build -t $AURA_IMAGE_NAME:unstable .
elif [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" =~ ^feat && "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "$CI_DEFAULT_BRANCH" ] elif [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" =~ ^feat && "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "$CI_DEFAULT_BRANCH" ]
then then
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 build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
else else
docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
fi fi
# TODO: maybe isolate docker build and docker push # TODO: maybe isolate docker build and docker push
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment