From f1af6b9bf241f38efcd5c8b4726dd6cbf4df81bc Mon Sep 17 00:00:00 2001
From: Matthew Jones <matburt@redhat.com>
Date: Wed, 30 Aug 2017 13:40:18 -0400
Subject: [PATCH] Support official image builds with awx logos

---
 installer/image_build/tasks/main.yml | 21 +++++++++++++++++++++
 installer/inventory                  | 17 ++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/installer/image_build/tasks/main.yml b/installer/image_build/tasks/main.yml
index ab7a31de79..6d74fabaff 100644
--- a/installer/image_build/tasks/main.yml
+++ b/installer/image_build/tasks/main.yml
@@ -11,6 +11,21 @@
     awx_version: "{{ awx_version_command.stdout }}"
   when: awx_version is not defined
 
+- name: Verify awx-logos directory exists for official install
+  stat:
+    path: "../../awx-logos"
+  delegate_to: localhost
+  register: logosdir
+  failed_when: logosdir.stat.isdir is not defined or not logosdir.stat.isdir
+  when: awx_official
+
+- name: Copy logos for inclusion in sdist
+  synchronize:
+    src: "../../awx-logos/awx/ui/client/assets"
+    dest: "../awx/ui/client/"
+  delegate_to: localhost
+  when: awx_official
+
 - name: Set sdist file name
   set_fact:
     awx_sdist_file: "awx-{{ awx_version }}.tar.gz"
@@ -19,6 +34,12 @@
   debug:
     msg: "{{ awx_sdist_file }}"
 
+- name: Clean distribution
+  shell: make clean
+  args:
+    chdir: ..
+  delegate_to: localhost
+
 - name: Build AWX distribution
   shell: make sdist
   args:
diff --git a/installer/inventory b/installer/inventory
index 62d7a1e9d0..ba88da284e 100644
--- a/installer/inventory
+++ b/installer/inventory
@@ -2,6 +2,9 @@ localhost ansible_connection=local
 
 [all:vars]
 
+# Build AWX with official logos
+# Agree to acceptance of trademark guidelines
+# Requires awx-logos be checked out in the directory containing the awx repository
 awx_official=false
 
 # Local Openshift
@@ -10,14 +13,18 @@ awx_official=false
 # openshift_host=127.0.0.1:8443
 # awx_openshift_project=awx
 # openshift_user=developer
-# docker_registry=172.30.1.1:5000
-# docker_registry_repository=awx
-# docker_registry_username=developer
 # awx_node_port=30083
 
 # Standalone Docker Install
-# postgres_data_dir=/tmp/pgdocker
-# host_port=80
+postgres_data_dir=/tmp/pgdocker
+host_port=80
+
+# Required for Openshift, Optional for Standalone Docker install
+# Define if you want the image pushed to a registry. The container definition
+# will also use these images
+# docker_registry=172.30.1.1:5000
+# docker_registry_repository=awx
+# docker_registry_username=developer
 
 # Set this if you have an external postgres you are pointing at
 # otherwise a new ephemeral awx postgres service will be created