External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 13:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

cleanup tooling

Browse Source
This commit is contained in:
Jake McDermott
2019-06-25 15:30:07 -04:00
committed by beeankha
parent 04404c93db
commit 37e73acb62
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

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

2
docs/notification_system.md
View File

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

11
tools/docker-httpbin-override.yml
View File

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