FIX #1
This commit is contained in:
17
Makefile
17
Makefile
@@ -1,10 +1,13 @@
|
||||
APPLICATION_NAME := django-test
|
||||
REPO_URL := https://heinzelwelt.de/vcs/python/django-test
|
||||
REPO_URL := https://dev.heinzelwerk.de/git/python/django-test
|
||||
REPO_DIR := src/$(APPLICATION_NAME)
|
||||
IMAGE_NAME := $(APPLICATION_NAME)
|
||||
IMAGE_LABEL := latest
|
||||
|
||||
HOST_PORT := 80
|
||||
CONTAINER_PORT := 80
|
||||
HTTP_HOST_PORT := 80
|
||||
HTTP_CONTAINER_PORT := 80
|
||||
HTTPS_HOST_PORT := 443
|
||||
HTTPS_CONTAINER_PORT := 443
|
||||
|
||||
DOCKER := docker
|
||||
DGOSS := dgoss
|
||||
@@ -21,18 +24,18 @@ $(REPO_DIR):
|
||||
$(GIT) clone $(REPO_URL) $@
|
||||
|
||||
$(IMAGE_NAME): $(REPO_DIR)
|
||||
$(DOCKER) build --build-arg APPLICATION_NAME=$(APPLICATION_NAME) -t $(IMAGE_NAME) .
|
||||
$(DOCKER) build --build-arg APPLICATION_NAME=$(APPLICATION_NAME) -t $(IMAGE_NAME):$(IMAGE_LABEL) .
|
||||
|
||||
image: $(IMAGE_NAME)
|
||||
|
||||
test:
|
||||
$(DGOSS) run $(IMAGE_NAME)
|
||||
$(DGOSS) run $(IMAGE_NAME):$(IMAGE_LABEL)
|
||||
|
||||
test-run:
|
||||
$(DOCKER) run -ti --rm -p $(HOST_PORT):$(CONTAINER_PORT) $(IMAGE_NAME)
|
||||
$(DOCKER) run -ti --rm -p $(HTTP_HOST_PORT):$(HTTP_CONTAINER_PORT) -p $(HTTPS_HOST_PORT):$(HTTPS_CONTAINER_PORT) $(IMAGE_NAME):$(IMAGE_LABEL)
|
||||
|
||||
enter:
|
||||
$(DOCKER) run -ti --rm -p $(HOST_PORT):$(CONTAINER_PORT) --entrypoint /bin/bash $(IMAGE_NAME)
|
||||
$(DOCKER) run -ti --rm -p $(HTTP_HOST_PORT):$(HTTP_CONTAINER_PORT) -p $(HTTPS_HOST_PORT):$(HTTPS_CONTAINER_PORT) --entrypoint /bin/bash $(IMAGE_NAME):$(IMAGE_LABEL)
|
||||
|
||||
dist-clean:
|
||||
-rm -rf $(REPO_DIR)
|
||||
|
||||
Reference in New Issue
Block a user