diff options
| author | Christian Adams <chadams@redhat.com> | 2020-05-14 19:21:46 +0200 |
|---|---|---|
| committer | Christian Adams <chadams@redhat.com> | 2020-05-14 19:21:46 +0200 |
| commit | c02f6b9ece09354b0b23d44f3ee71c8a01f175ce (patch) | |
| tree | b5e78c77d254a160f67542f8df64669dcaeee3fc /Makefile | |
| parent | Merge pull request #7020 from Wilk42/devel (diff) | |
| download | awx-c02f6b9ece09354b0b23d44f3ee71c8a01f175ce.tar.xz awx-c02f6b9ece09354b0b23d44f3ee71c8a01f175ce.zip | |
Remove redundant dev image build make target
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -650,17 +650,15 @@ detect-schema-change: genschema docker-compose-clean: awx/projects cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose rm -sf -docker-compose-build: awx-devel-build - # Base development image build -awx-devel-build: +docker-compose-build: docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile \ --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) . docker tag ansible/awx_devel $(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 -docker-compose-isolated-build: awx-devel-build +docker-compose-isolated-build: docker-compose-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) |