From 761db3f8ea343ca4bbfe3ba2545759282c6b07a4 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 16 Jul 2018 14:05:00 +0200 Subject: [PATCH] Start docker service before login and use v2 api on the registry Signed-off-by: Clement Verna --- inventory/group_vars/osbs-masters | 2 +- roles/push-docker/tasks/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs-masters index dd543f53a1..d9e96405bc 100644 --- a/inventory/group_vars/osbs-masters +++ b/inventory/group_vars/osbs-masters @@ -112,7 +112,7 @@ _osbs_reactor_config_map: - v2 registries: - - url: "{{ docker_registry }}" + - url: https://candidate-registry.fedoraproject.org/v2 insecure: True auth: cfg_path: /var/run/secrets/atomic-reactor/v2-registry-dockercfg diff --git a/roles/push-docker/tasks/main.yml b/roles/push-docker/tasks/main.yml index 16cdb2b172..5e7cbaabe9 100644 --- a/roles/push-docker/tasks/main.yml +++ b/roles/push-docker/tasks/main.yml @@ -30,11 +30,11 @@ # mode: 0640 # when: docker_cert_name is defined +- name: start and enable docker + service: name=docker state=started enabled=yes + - name: Log into the candidate-registry docker_login: registry: "{{candidate_registry}}" username: "{{candidate_registry_osbs_username}}" password: "{{candidate_registry_osbs_password}}" - -- name: start and enable docker - service: name=docker state=started enabled=yes