environment variables

2.0.0-beta.3/Dockerfile

@@ -6,7 +6,8 @@ RUN apt-get update && apt-get install -y \
         libjpeg62-turbo-dev \
         libmcrypt-dev \
         libpng12-dev \
-        netcat
+        netcat \
+        mysql-client
 
 # Elgg requirements
 RUN docker-php-ext-install pdo pdo_mysql mysql
@@ -25,10 +26,10 @@ RUN cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 # MySQL
 ENV MYSQL_USER=${MYSQL_USER:-"root"}
 ENV MYSQL_PASS=${MYSQL_PASS:-"root-pass"}
+ENV MYSQL_PORT=${MYSQL_PORT:-"3306"}
 
 # required for installation
 ENV ELGG_DB_HOST=${ELGG_DB_HOST:-"mysql"}
-ENV MYSQL_PORT=${MYSQL_PORT:-"3306"}
 ENV ELGG_DB_USER=$MYSQL_USER
 ENV ELGG_DB_PASS=$MYSQL_PASS
 ENV ELGG_DB_NAME=${ELGG_DB_NAME:-"elgg"}

2.0.0-beta.3/elgg-install.sh

@@ -2,20 +2,19 @@
 
 MYSQL_LOOPS="20"
 MYSQL_PORT="$MYSQL_PORT"
-MYSQL_HOST="$MYSQL_HOST"
 MYSQL_USER="$MYSQL_USER"
 MYSQL_PASS="$MYSQL_PASS"
-ELGG_DB_NAME="$ELGG_DB_NAME"
+ELGG_DB_HOST="$ELGG_DB_HOST"
 
 #wait for mysql
 i=0
-while ! netcat $MYSQL_HOST $MYSQL_PORT >/dev/null 2>&1 < /dev/null; do
+while ! netcat $ELGG_DB_HOST $MYSQL_PORT >/dev/null 2>&1 < /dev/null; do
   i=`expr $i + 1`
   if [ $i -ge $MYSQL_LOOPS ]; then
-    echo "$(date) - ${MYSQL_HOST}:${MYSQL_PORT} still not reachable, giving up."
+    echo "$(date) - ${ELGG_DB_HOST}:${MYSQL_PORT} still not reachable, giving up."
     exit 0
   fi
-  echo "$(date) - waiting for ${MYSQL_HOST}:${MYSQL_PORT}... 1/$MYSQL_LOOPS."
+  echo "$(date) - waiting for ${ELGG_DB_HOST}:${MYSQL_PORT}... $i/$MYSQL_LOOPS."
   sleep 1
 done