cleanup tooling

Makefile

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

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`.

tools/docker-httpbin-override.yml

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