Commit a5ed08c3 authored by Fabian Peter's avatar Fabian Peter
Browse files

Merge branch 'fix/provider-docker' into 'master'

fix: wrong branch for docker image

See merge request peter.saarland/shipmate!32
parents e658e2b1 b137714a
Pipeline #149959966 passed with stages
in 6 minutes and 14 seconds
......@@ -59,7 +59,7 @@
docker_image_registry_path != ''
- name: Tag
command: docker tag {{ docker_image }} {{ lookup('vars','docker_image_registry_path', default='')+docker_image_repository+'/'+docker_image_branch+':'+item }}
command: docker tag {{ docker_image }} {{ lookup('vars','docker_image_registry_path', default='')+docker_image_repository+':'+item }}
chdir="{{ shipmate_cargo_dir }}"
register: shipmate_tag_docker
with_items:
......@@ -77,7 +77,7 @@
ignore_errors: True
- name: Ship
command: docker push {{ lookup('vars','docker_image_registry_path', default='')+docker_image_repository+'/'+docker_image_branch+':'+item }}
command: docker push {{ lookup('vars','docker_image_registry_path', default='')+docker_image_repository+':'+item }}
chdir="{{ shipmate_cargo_dir }}"
with_items:
- "latest"
......@@ -98,4 +98,3 @@
when: >
shipmate_stage == "ship"
\ No newline at end of file
......@@ -14,7 +14,7 @@ variables:
DOCKER_HOST: tcp://docker:2375
IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
SHIPMATE_CARGO_DIR: $CI_BUILDS_DIR/$CI_PROJECT_PATH
SHIPMATE_VERSION: "1.12.2"
SHIPMATE_VERSION: "1.12.7"
.branch-master: &branch-master
if: '$CI_BUILD_REF_NAME == "master"'
......@@ -82,32 +82,32 @@ variables:
- exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
- <<: *branch-master
exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
- <<: *branch-alpha
exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
- <<: *branch-beta
exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
- <<: *branch-maintenance
exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
- <<: *branch-pre-release
exists:
- Dockerfile
- VERSION.txt
when: always
when: on_success
workflow:
rules:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment