diff options
| author | Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> | 2024-04-02 21:13:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 21:13:14 +0200 |
| commit | 7cdf1c7f96f9d66375d9d8174ee707dcfacee27c (patch) | |
| tree | f2d8e74b9f7c4c1d3927fea85f19e351c6dc19cb | |
| parent | Make db password optional for wsrelay (#15046) (diff) | |
| download | awx-7cdf1c7f96f9d66375d9d8174ee707dcfacee27c.tar.xz awx-7cdf1c7f96f9d66375d9d8174ee707dcfacee27c.zip | |
Update DOCKER_COMPOSE command to `docker compose` (#15056)
* Update DOCKER_COMPOSE command
docker-compose will stop being supported soon and this is causing CI flake setting DOCKER_COMPOSE default to `docker compose`
* Give AWX network a static name
| -rw-r--r-- | .github/actions/run_awx_devel/action.yml | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.github/actions/run_awx_devel/action.yml b/.github/actions/run_awx_devel/action.yml index d1f688bcdf..9ce4a0fbfe 100644 --- a/.github/actions/run_awx_devel/action.yml +++ b/.github/actions/run_awx_devel/action.yml @@ -71,7 +71,7 @@ runs: id: data shell: bash run: | - AWX_IP=$(docker inspect -f '{{.NetworkSettings.Networks._sources_awx.IPAddress}}' tools_awx_1) + AWX_IP=$(docker inspect -f '{{.NetworkSettings.Networks.awx.IPAddress}}' tools_awx_1) ADMIN_TOKEN=$(docker exec -i tools_awx_1 awx-manage create_oauth2_token --user admin) echo "ip=$AWX_IP" >> $GITHUB_OUTPUT echo "admin_token=$ADMIN_TOKEN" >> $GITHUB_OUTPUT @@ -2,7 +2,7 @@ PYTHON := $(notdir $(shell for i in python3.11 python3; do command -v $$i; done|sed 1q)) SHELL := bash -DOCKER_COMPOSE ?= docker-compose +DOCKER_COMPOSE ?= docker compose OFFICIAL ?= no NODE ?= node NPM_BIN ?= npm diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index 461d065b78..e6571386ca 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -363,6 +363,7 @@ volumes: networks: awx: + name: awx service-mesh: name: service-mesh {% if minikube_container_group|bool %} |