diff --git a/examples/docker/Dockerfile b/examples/docker/Dockerfile index 0f0bee95..264ca91c 100644 --- a/examples/docker/Dockerfile +++ b/examples/docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian #ubuntu:xenial -MAINTAINER Jocelyn Fiat +MAINTAINER Jocelyn Fiat LABEL description="EiffelWeb debug example hosted using apache2+libfcgi" RUN apt-get update \ @@ -12,7 +12,6 @@ RUN apt-get update \ EXPOSE 80 RUN a2enmod rewrite suexec include fcgid -RUN service apache2 restart RUN export uid=1000 gid=1000 && \ mkdir -p /home/eifweb && \ @@ -42,4 +41,8 @@ COPY ./files/html/index.html $WEBDIR/html/index.html RUN echo > $WEBDIR/html/service.ews RUN chown www-data:www-data -R $WEBDIR && chmod 400 $WEBDIR/html/* -RUN service apache2 restart +#Setup apache as foreground (for docker purpose) +RUN mkdir /etc/service/apache +ADD ./files/apache.sh /etc/service/apache/run +RUN chmod +x /etc/service/apache/run +ENTRYPOINT ["/etc/service/apache/run"] diff --git a/examples/docker/files/apache.sh b/examples/docker/files/apache.sh new file mode 100644 index 00000000..8000a6c4 --- /dev/null +++ b/examples/docker/files/apache.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/apache2ctl -D FOREGROUND