Skip to content
Snippets Groups Projects
Commit 51d4f1fd authored by Jan Hartig's avatar Jan Hartig
Browse files

Merge remote-tracking branch 'origin/main'

parents aa8a8fd4 b1ccf69a
Branches
No related tags found
1 merge request!15Fix exception on unmatched certs
Pipeline #13164 passed
......@@ -12,7 +12,6 @@ docker-build:
command: ["--tls=false"]
before_script:
- docker info
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# Default branch leaves tag empty (= latest tag)
# All other branches are tagged with the escaped branch name (commit ref slug)
......@@ -22,7 +21,7 @@ docker-build:
tag=""
echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
else
tag=":$CI_COMMIT_REF_SLUG"
tag=":$CI_COMMIT_REF_NAME"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
- docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
......@@ -32,3 +31,6 @@ docker-build:
- if: $CI_COMMIT_BRANCH
exists:
- Dockerfile
- if: '$CI_COMMIT_TAG =~ /^\d+\.\d+$/'
exists:
- Dockerfile
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment