docker/docker-django-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UPD: everything is better now :)

Browse Source
This commit is contained in:
heinzel
2019-04-13 18:25:28 +02:00
parent d219a6101f
commit 603c55f88e
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1 +1 @@
django-test src/django-test

2
Dockerfile
View File

@@ -8,7 +8,7 @@ RUN dnf -y update && \
COPY container-files/httpd-layer/ / COPY container-files/httpd-layer/ /
COPY django-test /srv/src/django-test COPY src/django-test /srv/src/django-test
COPY container-files/django-test-layer/ / COPY container-files/django-test-layer/ /
RUN /srv/bin/setup-django-test.sh /srv/django-test /srv/src/django-test RUN /srv/bin/setup-django-test.sh /srv/django-test /srv/src/django-test

17
Makefile
View File

@@ -1,17 +1,28 @@
APPLICATION_NAME := django-test APPLICATION_NAME := django-test
IMAGE_NAME := heinzel/$(APPLICATION_NAME) REPO_URL := https://heinzelwelt.de/vcs/python/django-test
REPO_DIR := src/$(APPLICATION_NAME)
IMAGE_NAME := $(APPLICATION_NAME)
DOCKER := docker DOCKER := docker
GIT := git
.PHONY: default help image run .PHONY: default help image test-run dist-clean
default: image default: image
help: help:
@echo "There is no help." @echo "There is no help."
image: $(REPO_DIR):
$(GIT) clone $(REPO_URL) $@
$(IMAGE_NAME): $(REPO_DIR)
$(DOCKER) build -t $(IMAGE_NAME) . $(DOCKER) build -t $(IMAGE_NAME) .
image: $(IMAGE_NAME)
test-run: test-run:
$(DOCKER) run -ti --rm -p 80:80 $(IMAGE_NAME) $(DOCKER) run -ti --rm -p 80:80 $(IMAGE_NAME)
dist-clean:
-rm -rf $(REPO_DIR)

14
README.rst
View File

@@ -5,7 +5,7 @@ Docker container for django-test.
DESCRIPTION DESCRIPTION
=========== ===========
The docker image is derivated from The django-heinzel docker image is derivated from
Fedora image (https://hub.docker.com/_/fedora). Fedora image (https://hub.docker.com/_/fedora).
It will contain and run It will contain and run
@@ -17,13 +17,17 @@ It will contain and run
BUILD BUILD
===== =====
- ``git clone https://heinzelwelt.de/vcs/python/django-test`` - ``make``
or alternatively the *long* way:
- ``git clone https://heinzelwelt.de/vcs/python/django-test src/django-test``
- ``docker build -t IMAGE_NAME .`` - ``docker build -t IMAGE_NAME .``
USAGE USAGE
===== =====
- ``docker run -d -p 80:80 -e LOG_LEVEL=error IMAGE_NAME`` - ``docker run -d -p 80:80 -e SERVER_ADMIN=heinzel@heinzelwelt.de IMAGE_NAME``
The httpd process is listening on port 80/tcp. The httpd process is listening on port 80/tcp.
@@ -35,9 +39,9 @@ CONFIGURATION
============= =============
The following **environment variables** are supported: The following **environment variables** are supported:
- LOG_LEVEL - LOG_LEVEL (default: error)
-- to set the httpd LogLevel directive -- to set the httpd LogLevel directive
- SERVER_ADMIN - SERVER_ADMIN (default: root@localhost)
-- to set the httpd ServerAdmin directive -- to set the httpd ServerAdmin directive

5
container-files/docker-entrypoint.sh
View File

@@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
DEFAULT_LOG_LEVEL="error"
# Disable CustomLog, that is configured by default in upstream. # Disable CustomLog, that is configured by default in upstream.
sed -i -e 's:^\(\s*\)\(CustomLog\s\s*"logs/access_log"\):\1# Disabled by /docker-entrypoint.sh # \2:' \ sed -i -e 's:^\(\s*\)\(CustomLog\s\s*"logs/access_log"\):\1# Disabled by /docker-entrypoint.sh # \2:' \
@@ -10,7 +11,5 @@ rm -rf /run/httpd/* /tmp/httpd*
if test "X${SERVER_ADMIN}" != "X" ; then if test "X${SERVER_ADMIN}" != "X" ; then
set -- -c "ServerAdmin $SERVER_ADMIN" "$@" set -- -c "ServerAdmin $SERVER_ADMIN" "$@"
fi fi
if test "X${LOG_LEVEL}" != "X" ; then set -- -c "LogLevel ${LOG_LEVEL:-${DEFAULT_LOG_LEVEL}}" "$@"
set -- -c "LogLevel $LOG_LEVEL" "$@"
fi
exec /usr/sbin/httpd -DFOREGROUND "$@" exec /usr/sbin/httpd -DFOREGROUND "$@"