|
@@ -16,19 +16,19 @@ ENV APACHE_LOG_DIR /var/log/apache2
|
|
|
ENV APACHE_LOCK_DIR /var/lock/apache2
|
|
|
ENV APACHE_PID_FILE /var/run/apache2.pid
|
|
|
|
|
|
-RUN mkdir -p /var/log/apache2 && chown -R $APACHE_RUN_USER /var/log/apache2 && \
|
|
|
- mkdir -p /var/run/apache2 && chown -R $APACHE_RUN_USER /var/run/apache2 && \
|
|
|
- mkdir -p /var/lock/apache2 && chown -R $APACHE_RUN_USER /var/lock/apache2 && \
|
|
|
+RUN mkdir -p /var/log/apache2 && chown -R ${APACHE_RUN_USER} /var/log/apache2 && \
|
|
|
+mkdir -p /var/lock/apache2 && chown -R ${APACHE_RUN_USER} /var/lock/apache2 && \
|
|
|
+ mkdir -p /var/run/apache2 && chown -R ${APACHE_RUN_USER} /var/run/apache2 && \
|
|
|
setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2
|
|
|
|
|
|
RUN rm -rf /var/www/html/*
|
|
|
ADD . /var/www/html
|
|
|
-RUN chown -R $APACHE_RUN_USER /var/www/html
|
|
|
+RUN chown -R ${APACHE_RUN_USER} /var/www/html
|
|
|
|
|
|
-USER $APACHE_RUN_USER
|
|
|
+USER ${APACHE_RUN_USER}
|
|
|
|
|
|
-ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
|
|
|
-ADD docker-entrypoint.sh /docker-entrypoint.sh
|
|
|
+ADD config/apache-config.conf /etc/apache2/sites-enabled/000-default.conf
|
|
|
+ADD config/docker-entrypoint.sh /docker-entrypoint.sh
|
|
|
|
|
|
EXPOSE 80
|
|
|
|