From 99056e3697b5540fe560c38c21b7c74bcb7e4064 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 23 Mar 2022 11:31:11 -0400
Subject: [PATCH 1/2] Update some references to our development images

---
 docs/development/minikube.md                                | 6 +++---
 .../docker-compose/ansible/roles/sources/defaults/main.yml  | 2 +-
 tools/docker-compose/inventory                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/development/minikube.md b/docs/development/minikube.md
index f18b72109d..c7097d58c5 100644
--- a/docs/development/minikube.md
+++ b/docs/development/minikube.md
@@ -71,7 +71,7 @@ In the root of awx-operator:
 ```
 $ ansible-playbook ansible/instantiate-awx-deployment.yml \
     -e development_mode=yes \
-    -e image=quay.io/awx/awx_kube_devel \
+    -e image=ghcr.io/ansible/awx_kube_devel \
     -e image_version=devel \
     -e image_pull_policy=Always \
     -e service_type=nodeport \
@@ -103,7 +103,7 @@ In the root of the AWX repo:
 
 ```
 $ make awx-kube-dev-build
-$ docker push quay.io/awx/awx_kube_devel:${COMPOSE_TAG}
+$ docker push ghcr.io/ansible/awx_kube_devel:${COMPOSE_TAG}
 ```
 
 In the root of awx-operator:
@@ -111,7 +111,7 @@ In the root of awx-operator:
 ```
 $ ansible-playbook ansible/instantiate-awx-deployment.yml \
     -e development_mode=yes \
-    -e image=quay.io/awx/awx_kube_devel \
+    -e image=ghcr.io/ansible/awx_kube_devel \
     -e image_version=${COMPOSE_TAG} \
     -e image_pull_policy=Always \
     -e service_type=nodeport \
diff --git a/tools/docker-compose/ansible/roles/sources/defaults/main.yml b/tools/docker-compose/ansible/roles/sources/defaults/main.yml
index c0cdb12b7f..aa74276f54 100644
--- a/tools/docker-compose/ansible/roles/sources/defaults/main.yml
+++ b/tools/docker-compose/ansible/roles/sources/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 sources_dest: '../_sources'
 compose_name: 'docker-compose.yml'
-awx_image: 'quay.io/ansible/awx_devel'
+awx_image: 'ghcr.io/ansible/awx_devel'
 pg_port: 5432
 pg_username: 'awx'
 pg_database: 'awx'
diff --git a/tools/docker-compose/inventory b/tools/docker-compose/inventory
index 3f9b08d920..f36a03f08b 100644
--- a/tools/docker-compose/inventory
+++ b/tools/docker-compose/inventory
@@ -15,5 +15,5 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth
 # pg_username=""
 # pg_hostname=""
 
-# awx_image="quay.io/awx/awx_devel"
+# awx_image="ghcr.io/ansible/awx_devel"
 # migrate_local_docker=false

From e87c9d8811e626f5fdd3ae461428030847c51739 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 23 Mar 2022 15:28:58 -0400
Subject: [PATCH 2/2] Fix command in build_awx_image.md

---
 docs/build_awx_image.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/build_awx_image.md b/docs/build_awx_image.md
index 4530e06458..c359f7e31e 100644
--- a/docs/build_awx_image.md
+++ b/docs/build_awx_image.md
@@ -6,9 +6,8 @@ To build a custom awx image to use with the awx-operator, use the `build_image`
 
 ```
 $ ansible-playbook tools/ansible/build.yml \
-    -e registry=registry.example.com \
-    -e awx_image=ansible/awx \
-    -e awx_version=test -v
+    -e awx_image=registry.example.com/ansible/awx \
+    -e awx_image_tag=test -v
 ```
 
 > Note: The development image (`make docker-compose-build`) will not work with the awx-operator, the UI is not built in that image, among other things (see Dockerfile.j2 for more info).