summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-03-01 15:55:24 -0800
committerJames E. Blair <jeblair@redhat.com>2019-03-01 15:55:24 -0800
commit9cbb8c0ac65eb33f6609c7b4390e6c9f05b612fe (patch)
treed87f3fe7ec4c97fb624af0173ed243c6f7550e6b
parent9c0d25f3498f38126c9d47b6b6a16a008e58fa40 (diff)
Fix docker image retag
The missing "." from the content-type headers was causing us to downgrade image manifests from v1 to to v2 when promoting them. That can cause problems since many tools no longer support v1 manifests. Notably, the docker registry is one of them. Change-Id: I35a5d29933669b80b49578587ebe6db8e13e62ad
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 02 Mar 2019 00:50:29 +0000 Reviewed-on: https://review.openstack.org/640558 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/promote-docker-image/tasks/promote-retag-inner.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/promote-docker-image/tasks/promote-retag-inner.yaml b/roles/promote-docker-image/tasks/promote-retag-inner.yaml
index 5643fe2..ed947d8 100644
--- a/roles/promote-docker-image/tasks/promote-retag-inner.yaml
+++ b/roles/promote-docker-image/tasks/promote-retag-inner.yaml
@@ -4,7 +4,7 @@
4 url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/change_{{ zuul.change }}_{{ image_tag }}" 4 url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/change_{{ zuul.change }}_{{ image_tag }}"
5 status_code: 200 5 status_code: 200
6 headers: 6 headers:
7 Accept: "application/vnd.docker.distribution.manifestv2+json" 7 Accept: "application/vnd.docker.distribution.manifest.v2+json"
8 Authorization: "Bearer {{ token.json.token }}" 8 Authorization: "Bearer {{ token.json.token }}"
9 return_content: true 9 return_content: true
10 register: manifest 10 register: manifest
@@ -16,7 +16,7 @@
16 status_code: 201 16 status_code: 201
17 body: "{{ manifest.content | string }}" 17 body: "{{ manifest.content | string }}"
18 headers: 18 headers:
19 Content-Type: "application/vnd.docker.distribution.manifestv2+json" 19 Content-Type: "application/vnd.docker.distribution.manifest.v2+json"
20 Authorization: "Bearer {{ token.json.token }}" 20 Authorization: "Bearer {{ token.json.token }}"
21- name: Delete the current change tag 21- name: Delete the current change tag
22 no_log: true 22 no_log: true