Browse Source

fix Docker run

Jan Behrens 4 years ago
parent
commit
55365dfaee
3 changed files with 6 additions and 4 deletions
  1. 2 2
      Dockerfile
  2. 2 0
      apache-config.conf
  3. 2 2
      docker-entrypoint.sh

+ 2 - 2
Dockerfile

@@ -17,8 +17,8 @@ ENV APACHE_LOCK_DIR /var/lock/apache2
 ENV APACHE_PID_FILE /var/run/apache2.pid
 
 RUN mkdir -p /var/log/apache2 && chown -R www-data /var/log/apache2 && \
-    mkdir -p /var/run/apache2 && chown -R www-data /var/run/apache2 && \
-    mkdir -p /var/lock/apache2 && chown -R www-data /var/lock/apache2 && \
+    mkdir -p /var/run/apache2 && chown -R www-data:www-data /var/run/apache2 && \
+    mkdir -p /var/lock/apache2 && chown -R www-data:www-data /var/lock/apache2 && \
     setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2
 
 RUN rm -rf /var/www/html/*

+ 2 - 0
apache-config.conf

@@ -1,5 +1,7 @@
 <VirtualHost *:80>
   #ServerAdmin example@kit.edu
+  ServerName sds-status.kaas.kit.edu
+
   DocumentRoot /var/www/html
 
   <Directory /var/www/html/>

+ 2 - 2
docker-entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+/usr/bin/id
+
 (
     sleep 10
     while true; do
@@ -10,5 +12,3 @@
 
 echo "Running apache server ..."
 /usr/sbin/apache2ctl -D FOREGROUND $@
-
-echo "Server terminated!"