Fixed directory permissions

cperrin88 · Feb 15, 2017 · 3f1a8d2 · 3f1a8d2
1 parent f304460
commit 3f1a8d2
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 87 deletions.
diff --git a/3.3.4/Dockerfile b/3.3.4/Dockerfile
@@ -1,5 +1,7 @@
 FROM php:5-apache
 
+LABEL maintainer "Christopher Perrin <[email protected]>"
+
 ENV STUDIP_VERSION=3.3.4
 ENV STUDIP_DOWNLOAD_URL="https://sourceforge.net/projects/studip/files/Stud.IP/3.3/studip-3.3.4.tar.bz2" \
     STUDIP_ARCHIVE_NAME="studip-$STUDIP_VERSION.tar.bz" \
@@ -34,14 +36,18 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so && \
 
 RUN cd /tmp && \
     wget "$STUDIP_DOWNLOAD_URL" -O "$STUDIP_ARCHIVE_NAME" && \
-    echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check && \
+    if [ -n "$STUDIP_ARCHIVE_HASH_SHA1" ]; then \
+      echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check; \
+    fi && \
     tar --extract --file "$STUDIP_ARCHIVE_NAME" && \
     rm "$STUDIP_ARCHIVE_NAME" && \
-    mv "$STUDIP_DIR_NAME" /usr/local/studip && \
-    ln -s /usr/local/studip/public /var/www/html/studip
+    mv "$STUDIP_DIR_NAME" /usr/local/studip
 
-RUN mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+RUN ln -s /usr/local/studip/public /var/www/html/studip && \
     mv /usr/local/studip/config/config_local.inc.php.dist /usr/local/studip/config/config_local.inc.php && \
+    mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+    chown --recursive www-data:www-data /usr/local/studip/public \
+                                        /usr/local/studip/data && \
     chmod a+rwx /tmp
 
 ADD entrypoint /usr/local/bin
@@ -53,4 +59,5 @@ ADD php.ini /usr/local/etc/php
 ENTRYPOINT ["entrypoint"]
 
 EXPOSE 80
+
 CMD ["apache2-foreground"]
diff --git a/3.3.4/entrypoint b/3.3.4/entrypoint
@@ -3,29 +3,22 @@ set -e
 
 LOCAL_CONF_FILE=/usr/local/studip/config/config_local.inc.php
 
-if [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_HOST"] && [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
   export STUDIP_CONF_DB_STUDIP_HOST="$MYSQL_PORT_3306_TCP_ADDR"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_USER"] && [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
   export STUDIP_CONF_DB_STUDIP_USER="$MYSQL_ENV_MYSQL_USER"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD"] && [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
   export STUDIP_CONF_DB_STUDIP_PASSWORD="$MYSQL_ENV_MYSQL_PASSWORD"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
+if [ -z "$STUDIP_CONF_DB_STUDIP_DATABASE"] && [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
   export STUDIP_CONF_DB_STUDIP_DATABASE="$MYSQL_ENV_MYSQL_DATABASE"
 fi
 
-if ([ -z "$STUDIP_CONF_DB_STUDIP_HOST" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_USER" ]); then
-  echo "Error: You have to set at least the STUDIP_CONF_DB_STUDIP_HOST, STUDIP_CONF_DB_STUDIP_PASSWORD and STUDIP_CONF_DB_STUDIP_USER to start"
-  exit 1
-fi
-
 #Interpret all vars starting with $prefix as variables in $LOCAL_CONF_FILE and replace them
 prefix="STUDIP_CONF"
 
@@ -42,9 +35,10 @@ for var in ${vars[@]}; do
 done
 
 if [ "$1" == "initdb" ]; then
-	mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
+  mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_default_data.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_root_user.sql
+  /usr/local/studip/cli/migrate.php
   exit 0
 fi
 

diff --git a/3.3.4/php.ini b/3.3.4/php.ini
@@ -5,4 +5,7 @@ max_execution_time=300
 short_open_tag=On
 session.use_trans_sid=Off
 allow_url_fopen=On
-error_reporting=0
+error_reporting=E_ALL
+log_errors=On
+display_errors = Off
+error_log = /var/log/php-error.log
diff --git a/3.3/Dockerfile b/3.3/Dockerfile
@@ -1,5 +1,7 @@
 FROM php:5-apache
 
+LABEL maintainer "Christopher Perrin <[email protected]>"
+
 ENV STUDIP_VERSION=3.3
 ENV STUDIP_DOWNLOAD_URL="https://sourceforge.net/projects/studip/files/Stud.IP/3.3/studip-3.3.tar.bz2" \
     STUDIP_ARCHIVE_NAME="studip-$STUDIP_VERSION.tar.bz" \
@@ -34,14 +36,18 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so && \
 
 RUN cd /tmp && \
     wget "$STUDIP_DOWNLOAD_URL" -O "$STUDIP_ARCHIVE_NAME" && \
-    echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check && \
+    if [ -n "$STUDIP_ARCHIVE_HASH_SHA1" ]; then \
+      echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check; \
+    fi && \
     tar --extract --file "$STUDIP_ARCHIVE_NAME" && \
     rm "$STUDIP_ARCHIVE_NAME" && \
-    mv "$STUDIP_DIR_NAME" /usr/local/studip && \
-    ln -s /usr/local/studip/public /var/www/html/studip
+    mv "$STUDIP_DIR_NAME" /usr/local/studip
 
-RUN mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+RUN ln -s /usr/local/studip/public /var/www/html/studip && \
     mv /usr/local/studip/config/config_local.inc.php.dist /usr/local/studip/config/config_local.inc.php && \
+    mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+    chown --recursive www-data:www-data /usr/local/studip/public \
+                                        /usr/local/studip/data && \
     chmod a+rwx /tmp
 
 ADD entrypoint /usr/local/bin
@@ -53,4 +59,5 @@ ADD php.ini /usr/local/etc/php
 ENTRYPOINT ["entrypoint"]
 
 EXPOSE 80
+
 CMD ["apache2-foreground"]
diff --git a/3.3/entrypoint b/3.3/entrypoint
@@ -3,29 +3,22 @@ set -e
 
 LOCAL_CONF_FILE=/usr/local/studip/config/config_local.inc.php
 
-if [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_HOST"] && [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
   export STUDIP_CONF_DB_STUDIP_HOST="$MYSQL_PORT_3306_TCP_ADDR"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_USER"] && [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
   export STUDIP_CONF_DB_STUDIP_USER="$MYSQL_ENV_MYSQL_USER"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD"] && [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
   export STUDIP_CONF_DB_STUDIP_PASSWORD="$MYSQL_ENV_MYSQL_PASSWORD"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
+if [ -z "$STUDIP_CONF_DB_STUDIP_DATABASE"] && [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
   export STUDIP_CONF_DB_STUDIP_DATABASE="$MYSQL_ENV_MYSQL_DATABASE"
 fi
 
-if ([ -z "$STUDIP_CONF_DB_STUDIP_HOST" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_USER" ]); then
-  echo "Error: You have to set at least the STUDIP_CONF_DB_STUDIP_HOST, STUDIP_CONF_DB_STUDIP_PASSWORD and STUDIP_CONF_DB_STUDIP_USER to start"
-  exit 1
-fi
-
 #Interpret all vars starting with $prefix as variables in $LOCAL_CONF_FILE and replace them
 prefix="STUDIP_CONF"
 
@@ -42,9 +35,10 @@ for var in ${vars[@]}; do
 done
 
 if [ "$1" == "initdb" ]; then
-	mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
+  mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_default_data.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_root_user.sql
+  /usr/local/studip/cli/migrate.php
   exit 0
 fi
 

diff --git a/3.3/php.ini b/3.3/php.ini
@@ -5,4 +5,7 @@ max_execution_time=300
 short_open_tag=On
 session.use_trans_sid=Off
 allow_url_fopen=On
-error_reporting=0
+error_reporting=E_ALL
+log_errors=On
+display_errors = Off
+error_log = /var/log/php-error.log
diff --git a/3.4.3/Dockerfile b/3.4.3/Dockerfile
@@ -1,5 +1,7 @@
 FROM php:5-apache
 
+LABEL maintainer "Christopher Perrin <[email protected]>"
+
 ENV STUDIP_VERSION=3.4.3
 ENV STUDIP_DOWNLOAD_URL="https://sourceforge.net/projects/studip/files/Stud.IP/3.4/studip-3.4.3.tar.bz2" \
     STUDIP_ARCHIVE_NAME="studip-$STUDIP_VERSION.tar.bz" \
@@ -34,14 +36,18 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so && \
 
 RUN cd /tmp && \
     wget "$STUDIP_DOWNLOAD_URL" -O "$STUDIP_ARCHIVE_NAME" && \
-    echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check && \
+    if [ -n "$STUDIP_ARCHIVE_HASH_SHA1" ]; then \
+      echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check; \
+    fi && \
     tar --extract --file "$STUDIP_ARCHIVE_NAME" && \
     rm "$STUDIP_ARCHIVE_NAME" && \
-    mv "$STUDIP_DIR_NAME" /usr/local/studip && \
-    ln -s /usr/local/studip/public /var/www/html/studip
+    mv "$STUDIP_DIR_NAME" /usr/local/studip
 
-RUN mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+RUN ln -s /usr/local/studip/public /var/www/html/studip && \
     mv /usr/local/studip/config/config_local.inc.php.dist /usr/local/studip/config/config_local.inc.php && \
+    mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+    chown --recursive www-data:www-data /usr/local/studip/public \
+                                        /usr/local/studip/data && \
     chmod a+rwx /tmp
 
 ADD entrypoint /usr/local/bin
@@ -53,4 +59,5 @@ ADD php.ini /usr/local/etc/php
 ENTRYPOINT ["entrypoint"]
 
 EXPOSE 80
+
 CMD ["apache2-foreground"]
diff --git a/3.4.3/entrypoint b/3.4.3/entrypoint
@@ -3,29 +3,22 @@ set -e
 
 LOCAL_CONF_FILE=/usr/local/studip/config/config_local.inc.php
 
-if [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_HOST"] && [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
   export STUDIP_CONF_DB_STUDIP_HOST="$MYSQL_PORT_3306_TCP_ADDR"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_USER"] && [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
   export STUDIP_CONF_DB_STUDIP_USER="$MYSQL_ENV_MYSQL_USER"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD"] && [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
   export STUDIP_CONF_DB_STUDIP_PASSWORD="$MYSQL_ENV_MYSQL_PASSWORD"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
+if [ -z "$STUDIP_CONF_DB_STUDIP_DATABASE"] && [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
   export STUDIP_CONF_DB_STUDIP_DATABASE="$MYSQL_ENV_MYSQL_DATABASE"
 fi
 
-if ([ -z "$STUDIP_CONF_DB_STUDIP_HOST" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_USER" ]); then
-  echo "Error: You have to set at least the STUDIP_CONF_DB_STUDIP_HOST, STUDIP_CONF_DB_STUDIP_PASSWORD and STUDIP_CONF_DB_STUDIP_USER to start"
-  exit 1
-fi
-
 #Interpret all vars starting with $prefix as variables in $LOCAL_CONF_FILE and replace them
 prefix="STUDIP_CONF"
 
@@ -42,9 +35,10 @@ for var in ${vars[@]}; do
 done
 
 if [ "$1" == "initdb" ]; then
-	mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
+  mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_default_data.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_root_user.sql
+  /usr/local/studip/cli/migrate.php
   exit 0
 fi
 

diff --git a/3.4.3/php.ini b/3.4.3/php.ini
@@ -5,4 +5,7 @@ max_execution_time=300
 short_open_tag=On
 session.use_trans_sid=Off
 allow_url_fopen=On
-error_reporting=0
+error_reporting=E_ALL
+log_errors=On
+display_errors = Off
+error_log = /var/log/php-error.log
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
@@ -1,5 +1,7 @@
 FROM php:7-apache
 
+LABEL maintainer "Christopher Perrin <[email protected]>"
+
 ENV STUDIP_VERSION=3.5
 ENV STUDIP_DOWNLOAD_URL="https://sourceforge.net/projects/studip/files/Stud.IP/3.5/studip-3.5.tar.bz2" \
     STUDIP_ARCHIVE_NAME="studip-$STUDIP_VERSION.tar.bz" \
@@ -34,14 +36,18 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so && \
 
 RUN cd /tmp && \
     wget "$STUDIP_DOWNLOAD_URL" -O "$STUDIP_ARCHIVE_NAME" && \
-    echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check && \
+    if [ -n "$STUDIP_ARCHIVE_HASH_SHA1" ]; then \
+      echo "$STUDIP_ARCHIVE_HASH_SHA1 $STUDIP_ARCHIVE_NAME" | sha1sum --check; \
+    fi && \
     tar --extract --file "$STUDIP_ARCHIVE_NAME" && \
     rm "$STUDIP_ARCHIVE_NAME" && \
-    mv "$STUDIP_DIR_NAME" /usr/local/studip && \
-    ln -s /usr/local/studip/public /var/www/html/studip
+    mv "$STUDIP_DIR_NAME" /usr/local/studip
 
-RUN mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+RUN ln -s /usr/local/studip/public /var/www/html/studip && \
     mv /usr/local/studip/config/config_local.inc.php.dist /usr/local/studip/config/config_local.inc.php && \
+    mv /usr/local/studip/config/config.inc.php.dist /usr/local/studip/config/config.inc.php && \
+    chown --recursive www-data:www-data /usr/local/studip/public \
+                                        /usr/local/studip/data && \
     chmod a+rwx /tmp
 
 ADD entrypoint /usr/local/bin
@@ -53,4 +59,5 @@ ADD php.ini /usr/local/etc/php
 ENTRYPOINT ["entrypoint"]
 
 EXPOSE 80
+
 CMD ["apache2-foreground"]
diff --git a/3.5/entrypoint b/3.5/entrypoint
@@ -3,29 +3,22 @@ set -e
 
 LOCAL_CONF_FILE=/usr/local/studip/config/config_local.inc.php
 
-if [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_HOST"] && [ -n "$MYSQL_PORT_3306_TCP_ADDR" ]; then
   export STUDIP_CONF_DB_STUDIP_HOST="$MYSQL_PORT_3306_TCP_ADDR"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_USER"] && [ -n "$MYSQL_ENV_MYSQL_USER" ]; then
   export STUDIP_CONF_DB_STUDIP_USER="$MYSQL_ENV_MYSQL_USER"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
+if [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD"] && [ -n "$MYSQL_ENV_MYSQL_PASSWORD" ]; then
   export STUDIP_CONF_DB_STUDIP_PASSWORD="$MYSQL_ENV_MYSQL_PASSWORD"
 fi
 
-if [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
+if [ -z "$STUDIP_CONF_DB_STUDIP_DATABASE"] && [ -n "$MYSQL_ENV_MYSQL_DATABASE" ];  then
   export STUDIP_CONF_DB_STUDIP_DATABASE="$MYSQL_ENV_MYSQL_DATABASE"
 fi
 
-if ([ -z "$STUDIP_CONF_DB_STUDIP_HOST" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_PASSWORD" ] || \
-   [ -z "$STUDIP_CONF_DB_STUDIP_USER" ]); then
-  echo "Error: You have to set at least the STUDIP_CONF_DB_STUDIP_HOST, STUDIP_CONF_DB_STUDIP_PASSWORD and STUDIP_CONF_DB_STUDIP_USER to start"
-  exit 1
-fi
-
 #Interpret all vars starting with $prefix as variables in $LOCAL_CONF_FILE and replace them
 prefix="STUDIP_CONF"
 
@@ -42,9 +35,10 @@ for var in ${vars[@]}; do
 done
 
 if [ "$1" == "initdb" ]; then
-	mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
+  mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_default_data.sql
   mysql --host="$MYSQL_PORT_3306_TCP_ADDR" --user="$MYSQL_ENV_MYSQL_USER" --password="$MYSQL_ENV_MYSQL_PASSWORD" "$MYSQL_ENV_MYSQL_DATABASE" < /usr/local/studip/db/studip_root_user.sql
+  /usr/local/studip/cli/migrate.php
   exit 0
 fi
 

diff --git a/3.5/php.ini b/3.5/php.ini
@@ -5,4 +5,7 @@ max_execution_time=300
 short_open_tag=On
 session.use_trans_sid=Off
 allow_url_fopen=On
-error_reporting=0
+error_reporting=E_ALL
+log_errors=On
+display_errors = Off
+error_log = /var/log/php-error.log