Improve push capabilities and allow build playbook to push

installer/build.yml

@@ -4,3 +4,4 @@
   gather_facts: false
   roles:
     - { role: image_build }
+    - { role: image_push, when: "docker_registry is defined" }

installer/image_push/tasks/main.yml

@@ -0,0 +1,40 @@
+---
+- name: Remove local images to ensure proper push behavior
+  block:
+    - name: Remove web image
+      docker_image:
+        name: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_web_image }}"
+        tag: "{{ awx_version }}"
+        state: absent
+
+    - name: Remove task image
+      docker_image:
+        name: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_task_image }}"
+        tag: "{{ awx_version }}"
+        state: absent
+  delegate_to: localhost
+  when: docker_remove_local_images
+
+- name: Tag and Push Container Images
+  block:
+    - name: Tag and push web image to registry
+      docker_image:
+        name: "{{ awx_web_image }}"
+        repository: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_web_image }}"
+        tag: "{{ awx_version }}"
+        push: yes
+
+    - name: Tag and push task image to registry
+      docker_image:
+        name: "{{ awx_task_image }}"
+        repository: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_task_image }}"
+        tag: "{{ awx_version }}"
+        push: yes
+  delegate_to: localhost
+
+- name: Set full image path for Registry
+  set_fact:
+    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 }}

installer/install.yml

@@ -7,4 +7,3 @@
     - { role: image_build, when: "dockerhub_base is not defined" }
     - { role: openshift, when: "openshift_host is defined" }
     - { role: local_docker, when: "openshift_host is not defined" }
-

installer/inventory

@@ -39,6 +39,11 @@ host_port=80
 # docker_registry_repository=awx
 # docker_registry_username=developer
 
+
+# Docker_image will not attempt to push to remote if the image already exists locally
+# Set this to true to delete images from docker on the build host so that they are pushed to the remote repository
+docker_remove_local_images=False
+
 # Set pg_hostname if you have an external postgres server, otherwise
 # a new postgres service will be created
 # pg_hostname=postgresql

installer/local_docker/tasks/main.yml

@@ -65,31 +65,9 @@
         timeout: 300
       when: ansible_connection != "local" and docker_registry is not defined
 
-    - name: Tag and push web image to registry
-      docker_image:
-        name: "{{ awx_web_image }}"
-        repository: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_web_image }}"
-        tag: "{{ awx_version }}"
-        push: yes
-      when: docker_registry is defined
-      delegate_to: localhost
-
-    - name: Tag and push task image to registry
-      docker_image:
-        name: "{{ awx_task_image }}"
-        repository: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_task_image }}"
-        tag: "{{ awx_version }}"
-        push: yes
-      when: docker_registry is defined
-      delegate_to: localhost
-
-    - name: Set full image path for Registry
-      set_fact:
-        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
+    - include_role:
+        name: image_push
+      when: docker_registry is defined and dockerhub_base is not defined
 
     - name: Set full image path for local install
       set_fact: