diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | docs/notification_system.md | 2 | ||||
| -rw-r--r-- | tools/docker-httpbin-override.yml | 11 |
3 files changed, 1 insertions, 15 deletions
@@ -583,9 +583,6 @@ 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-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 f76c880f50..65b05607b3 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-httpbin +docker run --network="tools_default" --name httpbin -p 8204:80 kennethreitz/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-httpbin-override.yml b/tools/docker-httpbin-override.yml deleted file mode 100644 index 528ed7b353..0000000000 --- a/tools/docker-httpbin-override.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '2' -services: - # Primary Tower Development Container link - awx: - links: - - httpbin - httpbin: - image: kennethreitz/httpbin - container_name: tools_httpbin_1 - ports: - - '8204:80' |