Skip to content

Commit

Permalink
removed docker targets
Browse files Browse the repository at this point in the history
  • Loading branch information
cehbrecht committed Feb 27, 2018
1 parent 7f99588 commit bae7588
Showing 1 changed file with 1 addition and 32 deletions.
33 changes: 1 addition & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ endif
DOWNLOAD_CACHE := $(APP_ROOT)/downloads
BUILDOUT_FILES := parts eggs develop-eggs bin .installed.cfg .mr.developer.cfg *.egg-info bootstrap-buildout.py *.bak.* $(DOWNLOAD_CACHE)

# Docker
DOCKER_IMAGE := birdhouse/$(APP_NAME)
DOCKER_CONTAINER := $(APP_NAME)

# end of configuration

.DEFAULT_GOAL := help
Expand Down Expand Up @@ -84,9 +80,6 @@ help:
@echo " stop to stop supervisor service."
@echo " restart to restart supervisor service."
@echo " status to show supervisor status"
@echo "\nDocker targets:"
@echo " Dockerfile to generate a Dockerfile for $(APP_NAME)."
@echo " dockerbuild to build a docker image for $(APP_NAME)."

.PHONY: version
version:
Expand All @@ -103,8 +96,7 @@ info:
@echo " APP_NAME $(APP_NAME)"
@echo " APP_ROOT $(APP_ROOT)"
@echo " DOWNLOAD_CACHE $(DOWNLOAD_CACHE)"
@echo " DOCKER_IMAGE $(DOCKER_IMAGE)"


## Helper targets ... ensure that Makefile etc are in place

.PHONY: backup
Expand Down Expand Up @@ -294,26 +286,3 @@ restart:
status:
@echo "Supervisor status ..."
bin/supervisorctl status


## Docker targets

.PHONY: Dockerfile
Dockerfile: bootstrap
@echo "Update Dockerfile ..."
bin/buildout -c custom.cfg install docker

.PHONY: dockerrmi
dockerrmi:
@echo "Removing previous docker image ..."
docker rmi $(DOCKER_IMAGE)

.PHONY: dockerbuild
dockerbuild: Dockerfile
@echo "Building docker image ..."
docker build --rm -t $(DOCKER_IMAGE) .

.PHONY: dockerrun
dockerrun: dockerbuild
@echo "Run docker image ..."
docker run -i -t -p 9001:9001 --name=$(DOCKER_CONTAINER) $(DOCKER_IMAGE) /bin/bash

0 comments on commit bae7588

Please sign in to comment.