zuul/zuul-jobs
Code Issues Proposed changes

Always log out of docker registry after upload

Browse Source 
Make sure we always log out of the docker registry, as not to allow
other playbooks to use the session.

Change-Id: I65fb71884b08802b5537ecef7304129cdeb952c3
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2020-11-12 14:01:57 -05:00
parent feaf0f2ad5
commit c3309e045a
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
roles/upload-docker-image/tasks/main.yaml
View File

@ -12,20 +12,25 @@
command: "docker login -u {{ docker_credentials.username }} -p {{ docker_credentials.password }} {{ docker_registry }}" command: "docker login -u {{ docker_credentials.username }} -p {{ docker_credentials.password }} {{ docker_registry }}"
no_log: true no_log: true
- name: Determine if we need to use buildx - name: Publish docker images
set_fact: block:
use_buildx: "{{ docker_images | selectattr('arch', 'defined') | list }}" - name: Determine if we need to use buildx
set_fact:
use_buildx: "{{ docker_images | selectattr('arch', 'defined') | list }}"
- name: Upload image to dockerhub normally - name: Upload image to dockerhub normally
loop: "{{ docker_images }}" loop: "{{ docker_images }}"
loop_control: loop_control:
loop_var: zj_image loop_var: zj_image
include_tasks: push.yaml include_tasks: push.yaml
when: not use_buildx when: not use_buildx
- name: Upload image to dockerhub using buildx - name: Upload image to dockerhub using buildx
loop: "{{ docker_images }}" loop: "{{ docker_images }}"
loop_control: loop_control:
loop_var: zj_image loop_var: zj_image
include_tasks: buildx.yaml include_tasks: buildx.yaml
when: use_buildx when: use_buildx
always:
- name: Log out of registry
command: "docker logout {{ docker_registry }}"