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

Clean up related to isolated env

Browse Source 
- Made  make target names consistent with our other commands
- Found some unnecessary code, deleted it
This commit is contained in:
Shane McDonald
2019-06-05 13:07:10 -04:00
parent 8be0b01c33
commit b00979792e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -551,10 +551,7 @@ docker-auth:
fi; fi;
# Docker isolated rampart # Docker isolated rampart
docker-isolated: docker-compose-isolated:
TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml create
docker start tools_awx_1
docker start tools_isolated_1
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-isolated-override.yml up 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-isolated-override.yml up
# Docker Compose Development environment # Docker Compose Development environment
@@ -595,7 +592,7 @@ awx-devel-build:
#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
# For use when developing on "isolated" AWX deployments # For use when developing on "isolated" AWX deployments
awx-isolated-build: awx-devel-build docker-compose-isolated-build: awx-devel-build
docker build -t ansible/awx_isolated -f tools/docker-isolated/Dockerfile . docker build -t ansible/awx_isolated -f tools/docker-isolated/Dockerfile .
docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
#docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)

2
tools/docker-isolated-override.yml
View File

@@ -13,6 +13,4 @@ services:
hostname: isolated hostname: isolated
volumes: volumes:
- "../awx/main/isolated:/awx_devel" - "../awx/main/isolated:/awx_devel"
- "../awx/lib:/awx_lib"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro"
privileged: true privileged: true