init APACHE_LOCK_DIR and mutexFile
This commit is contained in:
1 parent
5501e98941
commit
54500dc34d
1 file changed
+8
-4
+8
-4
@@ -11,7 +11,8 @@ RUN apt-get update && \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
libjansson4 \
|
libjansson4 \
|
||||||
libapache2-mod-auth-openidc \
|
libapache2-mod-auth-openidc \
|
||||||
vim apt-utils && \
|
vim apt-utils \
|
||||||
|
less && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
a2enmod auth_openidc && \
|
a2enmod auth_openidc && \
|
||||||
a2enmod headers && \
|
a2enmod headers && \
|
||||||
@@ -22,7 +23,8 @@ RUN apt-get update && \
|
|||||||
a2enmod env && \
|
a2enmod env && \
|
||||||
a2enmod mime && \
|
a2enmod mime && \
|
||||||
a2enmod proxy_wstunnel && \
|
a2enmod proxy_wstunnel && \
|
||||||
a2enmod negotiation
|
a2enmod negotiation && \
|
||||||
|
sed -i 's/#Mutex/Mutex/g' /etc/apache2/mods-enabled/ssl.conf
|
||||||
|
|
||||||
ADD apache2.conf /etc/apache2/apache2.conf
|
ADD apache2.conf /etc/apache2/apache2.conf
|
||||||
|
|
||||||
@@ -31,6 +33,7 @@ ENV APACHE_RUN_USER www-data
|
|||||||
ENV APACHE_RUN_DIR /var/run/apache2
|
ENV APACHE_RUN_DIR /var/run/apache2
|
||||||
ENV APACHE_PID_FILE /var/run/apache2/pid
|
ENV APACHE_PID_FILE /var/run/apache2/pid
|
||||||
ENV APACHE_LOG_DIR /var/log/apache2
|
ENV APACHE_LOG_DIR /var/log/apache2
|
||||||
|
ENV APACHE_LOCK_DIR /var/lock/apache2
|
||||||
|
|
||||||
# set to debug to debug apache oid problems
|
# set to debug to debug apache oid problems
|
||||||
# BE AWARE: loglevel debug will log all tokens and MUST NEVER be used in production
|
# BE AWARE: loglevel debug will log all tokens and MUST NEVER be used in production
|
||||||
@@ -58,11 +61,12 @@ ENV OIDC_PROVIDER_ENDSESSION_ENDPOINT "/v2/logout"
|
|||||||
ENV OIDC_RETURN_TO "http://localhost/openidc?logout=get"
|
ENV OIDC_RETURN_TO "http://localhost/openidc?logout=get"
|
||||||
|
|
||||||
RUN mkdir -p /var/run/apache2 /var/www/html/app && \
|
RUN mkdir -p /var/run/apache2 /var/www/html/app && \
|
||||||
|
mkdir -p /var/lock/apache2/ssl_mutex && \
|
||||||
mkdir -p /config/global.d && \
|
mkdir -p /config/global.d && \
|
||||||
mkdir -p /config/vhost-80.d && \
|
mkdir -p /config/vhost-80.d && \
|
||||||
mkdir -p /config/vhost-443.d && \
|
mkdir -p /config/vhost-443.d && \
|
||||||
chmod -R 755 /var/www/html/app && \
|
chmod -R 755 /var/www/html/app /var/lock/apache2 && \
|
||||||
chown -R www-data /var/run/apache2 /var/log/apache2 /var/www/html/app && \
|
chown -R www-data /var/run/apache2 /var/log/apache2 /var/www/html/app /var/lock/apache2 && \
|
||||||
rm /etc/apache2/sites-enabled/000-default.conf
|
rm /etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
ADD index.html /var/www/html/app
|
ADD index.html /var/www/html/app
|
||||||
|
|||||||