Commit 6bce5546 authored by olaf michaelis's avatar olaf michaelis
Browse files

Modify make file slight, because my editor trims white spaces at the end of...

Modify make file slight, because my editor trims white spaces at the end of lines, change default restart policy to always
parent dd8f03a1
......@@ -9,11 +9,12 @@ DOCKER_IN_GROUPS=$(shell groups | grep "docker")
MYID=$(shell id -u)
ifeq ($(strip $(DOCKER_IN_GROUPS)),)
SUDO_CMD=sudo
DC_CMD=sudo docker-compose
else
SUDO_CMD=
DC_CMD=docker-compose
endif
all: preparations run_build tail_logs
preps: preparations
build: preparations run_build
......@@ -33,21 +34,21 @@ preparations:
| sed 's|<RESTART_POLICY>|${RESTART_POLICY}|g' \
| sed 's|<VARIABLES_FILE>|${VARS_ENV}|g' \
> ${DC_TEMP}
cat rdmo/dockerfile_master \
| sed 's|<UID>|$(MYID)|g' \
> rdmo/dockerfile
cat apache/dockerfile_master \
| sed 's|<UID>|$(MYID)|g' \
> apache/dockerfile
run_build:
$(SUDO_CMD)docker-compose up --build -d
$(DC_CMD) up --build -d
run_remove:
$(SUDO_CMD)docker-compose down --rmi all
$(SUDO_CMD)docker-compose rm --force
$(DC_CMD) down --rmi all
$(DC_CMD) rm --force
tail_logs:
$(SUDO_CMD)docker-compose logs -f
\ No newline at end of file
$(DC_CMD) logs -f
......@@ -3,7 +3,7 @@ GLOBAL_PREFIX=rdc-
FINALLY_EXPOSED_PORT=8484
# Docker restart policy (no, on-failure, always, unless-stopped)
# see https://docs.docker.com/compose/compose-file/#restart
RESTART_POLICY=no
RESTART_POLICY=always
# settings inside the containers
VOL=/vol
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment