From ee15db4c7c49710b1b114e0f83b3b96e1f096faa Mon Sep 17 00:00:00 2001 From: Jaron Rolfe Date: Thu, 12 Oct 2017 15:57:34 -0400 Subject: [PATCH] allow for private registry without latest tag The logic that sets awx_web_docker_actual_image and awx_task_docker_actual_image creates and pushes images to the private registry tagged with the awx version, which is appropriate, but then tries to pull with no tag. (so docker defaults to "latest", which does not exist) --- installer/local_docker/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml index 0e81ac8a10..b18b778516 100644 --- a/installer/local_docker/tasks/main.yml +++ b/installer/local_docker/tasks/main.yml @@ -85,8 +85,10 @@ - name: Set full image path for Registry set_fact: - awx_web_docker_actual_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_web_image }}" - awx_task_docker_actual_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_task_image }}" + awx_web_docker_actual_image: >- + {{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_web_image }}:{{ awx_version }} + awx_task_docker_actual_image: >- + {{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_task_image }}:{{ awx_version }} when: docker_registry is defined - name: Set full image path for local install