diff options
| author | Shane McDonald <me@shanemcd.com> | 2019-06-05 19:07:10 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2019-06-06 16:15:11 +0200 |
| commit | b00979792e87d8215ed8a31e8435e319e599bda5 (patch) | |
| tree | 6903f006d0e08ca38d4af1ca19f43fb8a4696c25 /Makefile | |
| parent | Merge pull request #4013 from ansible/docker-container-tag-updates (diff) | |
| download | awx-b00979792e87d8215ed8a31e8435e319e599bda5.tar.xz awx-b00979792e87d8215ed8a31e8435e319e599bda5.zip | |
Clean up related to isolated env
- Made make target names consistent with our other commands
- Found some unnecessary code, deleted it
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -551,10 +551,7 @@ docker-auth: fi; # Docker isolated rampart -docker-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 +docker-compose-isolated: 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 @@ -595,7 +592,7 @@ awx-devel-build: #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) # 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 tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) |