diff --git a/Dockerfile b/Dockerfile index 1cef3d2..3cd92a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,13 +37,6 @@ 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/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 ENV APACHE_PID_FILE=/var/run/apache2/apache2.pid ENV APACHE_LOCK_DIR=/var/lock/apache2 @@ -52,6 +45,13 @@ ENV APACHE_RUN_DIR=/var/run/apache2 ENV APACHE_RUN_USER=deploy ENV APACHE_RUN_GROUP=deploy +# 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 + # set path to include ~/.local/bin ENV PATH "$PATH:/home/deploy/.local/bin"