Commit 1af007ec authored by Olaf Michaelis's avatar Olaf Michaelis
Browse files

Improve makefile

parent 395b59de
......@@ -27,7 +27,7 @@ COPY ./vhosts.conf "${HTTPD_VHOSTS}"
COPY ./ /
COPY ./ /
RUN useradd -m -u $UID -s /bin/bash rdmo
RUN useradd -m -u ${UID} -s /bin/bash rdmo
RUN mkdir -p /var/www/html
RUN mkdir -p /var/run/apache2
......@@ -8,6 +8,7 @@ RESTART_POLICY=$(shell cat ${CURDIR}/${VARS_ENV} | grep -Po "(?<=RESTART_POLICY=
DOCKER_IN_GROUPS=$(shell groups | grep "docker")
MYID=$(shell id -u)
ifeq ($(strip $(DOCKER_IN_GROUPS)),)
DC_CMD=sudo docker-compose
......@@ -15,11 +16,19 @@ else
all: preparations run_build tail_logs
preps: preparations
build: preparations run_build
fromscratch: preparations run_remove run_build
remove: run_remove
all: root_check preparations run_build tail_logs
preps: root_check preparations
build: root_check preparations run_build
restart: run_restart
fromscratch: root_check preparations run_remove run_build
remove: root_check run_remove
@if [ "${MYID}" = "0" ]; then \
echo Please do not run as root. It is neither recommended nor would it work.; \
mkdir -p ${CURDIR}/vol/log
......@@ -50,5 +59,8 @@ run_remove:
$(DC_CMD) down --rmi all
$(DC_CMD) rm --force
$(DC_CMD) restart
$(DC_CMD) logs -f
......@@ -32,7 +32,7 @@ COPY ./rootfs /
RUN chmod -R 777 /tmp
RUN useradd -m -u $UID -s /bin/bash rdmo
RUN useradd -m -u ${UID} -s /bin/bash rdmo
USER rdmo
CMD ["/"]
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