Merge pull request #11941 from shanemcd/update-devel-image-refs

Update some references to our development images
This commit is contained in:
Shane McDonald 2022-03-23 15:57:18 -04:00 committed by GitHub
commit 7b2b979c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions

View File

@ -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).

View File

@ -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 \

View File

@ -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'

View File

@ -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