diff --git a/Makefile b/Makefile index 7b1b7ca017..9a555bb3e1 100644 --- a/Makefile +++ b/Makefile @@ -583,8 +583,8 @@ docker-compose-credential-plugins: docker-auth echo -e "\033[0;31mTo generate a CyberArk Conjur API key: docker exec -it tools_conjur_1 conjurctl account create quick-start\033[0m" CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-credential-plugins-override.yml up --no-recreate awx -docker-compose-notifications: docker-auth - CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-notifications-override.yml up --no-recreate awx +docker-compose-httpbin: docker-auth + CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-httpbin-override.yml up --no-recreate awx docker-compose-test: docker-auth cd tools && CURRENT_UID=$(shell id -u) OS="$(shell docker info | grep 'Operating System')" TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash diff --git a/docs/notification_system.md b/docs/notification_system.md index cc7cc2a7e5..f76c880f50 100644 --- a/docs/notification_system.md +++ b/docs/notification_system.md @@ -221,7 +221,7 @@ http://flask.pocoo.org/snippets/111/ You can also link an `httpbin` service to the development environment for testing webhooks using: ``` -make docker-compose-notifications +make docker-compose-httpbin ``` This will create an `httpbin` service reachable from the AWX container at `http://httpbin/post`, `http://httpbin/put`, etc. Outside of the container, you can reach the service at `http://localhost:8204`. diff --git a/tools/docker-notifications-override.yml b/tools/docker-httpbin-override.yml similarity index 100% rename from tools/docker-notifications-override.yml rename to tools/docker-httpbin-override.yml