|
|
@ -37,6 +37,13 @@ ADD dav_svn.conf /etc/apache2/sites-enabled/dav_svn.conf |
|
|
|
#RUN sed -i.bak 's/LogLevel warn/LogLevel debug/' /etc/apache2/apache2.conf |
|
|
|
#RUN sed -i.bak 's/LogLevel warn/LogLevel debug/' /etc/apache2/apache2.conf |
|
|
|
RUN sed -i.bak 's/Listen 80/Listen 80\nListen 8000/' /etc/apache2/ports.conf |
|
|
|
RUN sed -i.bak 's/Listen 80/Listen 80\nListen 8000/' /etc/apache2/ports.conf |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# allow sudo http-foreground for deploy user |
|
|
|
|
|
|
|
ADD sudoer_deploy /etc/sudoers.d/deploy |
|
|
|
|
|
|
|
RUN chmod 0440 /etc/sudoers.d/deploy |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# switch to user deploy |
|
|
|
|
|
|
|
USER deploy |
|
|
|
|
|
|
|
|
|
|
|
# setup runtime variables for apache |
|
|
|
# setup runtime variables for apache |
|
|
|
ENV APACHE_PID_FILE=/var/run/apache2/apache2.pid |
|
|
|
ENV APACHE_PID_FILE=/var/run/apache2/apache2.pid |
|
|
|
ENV APACHE_LOCK_DIR=/var/lock/apache2 |
|
|
|
ENV APACHE_LOCK_DIR=/var/lock/apache2 |
|
|
@ -45,13 +52,6 @@ ENV APACHE_RUN_DIR=/var/run/apache2 |
|
|
|
ENV APACHE_RUN_USER=deploy |
|
|
|
ENV APACHE_RUN_USER=deploy |
|
|
|
ENV APACHE_RUN_GROUP=deploy |
|
|
|
ENV APACHE_RUN_GROUP=deploy |
|
|
|
|
|
|
|
|
|
|
|
# allow sudo http-foreground for deploy user |
|
|
|
|
|
|
|
ADD sudoer_deploy /etc/sudoer.d/deploy |
|
|
|
|
|
|
|
RUN chmod 0440 /etc/sudoer.d/deploy |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# switch to user deploy |
|
|
|
|
|
|
|
USER deploy |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# set path to include ~/.local/bin |
|
|
|
# set path to include ~/.local/bin |
|
|
|
ENV PATH "$PATH:/home/deploy/.local/bin" |
|
|
|
ENV PATH "$PATH:/home/deploy/.local/bin" |
|
|
|
|
|
|
|
|
|
|
@ -62,7 +62,5 @@ RUN pip install git+https://git.cpi.imtek.uni-freiburg.de/CPI/elab-users.git |
|
|
|
# change the working directory |
|
|
|
# change the working directory |
|
|
|
WORKDIR /data |
|
|
|
WORKDIR /data |
|
|
|
|
|
|
|
|
|
|
|
USER root |
|
|
|
|
|
|
|
# Start httpd as root, but will switch to deploy user thanks to env variable |
|
|
|
# Start httpd as root, but will switch to deploy user thanks to env variable |
|
|
|
#CMD ["sudo", "httpd-foreground"] |
|
|
|
CMD ["sudo", "httpd-foreground"] |
|
|
|
CMD ["httpd-foreground"] |
|
|
|
|
|
|
|