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

Merge branch 'develop' into 'main' 

Develop

See merge request !13
parents e19a74d9 68c5598c
No related branches found
No related tags found
1 merge request!13Develop
Pipeline #11549 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitlab-ci.yml
+ 1
− 1
View file @ 11fe1174
...@@ -12,7 +12,6 @@ docker-build: ...@@ -12,7 +12,6 @@ docker-build:
command: ["--tls=false"] command: ["--tls=false"]
before_script: before_script:
- docker info
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# Default branch leaves tag empty (= latest tag) # Default branch leaves tag empty (= latest tag)
# All other branches are tagged with the escaped branch name (commit ref slug) # All other branches are tagged with the escaped branch name (commit ref slug)
...@@ -32,3 +31,4 @@ docker-build: ...@@ -32,3 +31,4 @@ docker-build:
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
exists: exists:
- Dockerfile - Dockerfile
- if: '$CI_COMMIT_TAG =~ /^\d+\.\d+$/'
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment