Create tag 2.0.0-beta.3

Dockerfile → 2.0.0-beta.3/Dockerfile

@@ -24,7 +24,7 @@ RUN cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 # set defaults or env vars for Elgg and MySQL
 # MySQL
 ENV MYSQL_USER=${MYSQL_USER:-"root"}
-ENV MYSQL_PASS=${MYSQL_PASS:-"123123"}
+ENV MYSQL_PASS=${MYSQL_PASS:-"root-pass"}
 
 # required for installation
 ENV ELGG_DB_HOST=${ELGG_DB_HOST:-"mysql"}
@@ -37,14 +37,11 @@ ENV ELGG_SITE_NAME=${ELGG_SITE_NAME:-"Elgg Site"}
 ENV ELGG_DATA_ROOT=${ELGG_DATA_ROOT:-"/media/elgg/"}
 ENV ELGG_WWW_ROOT=${ELGG_WWW_ROOT:-"http://localhost:8000"}
 
-# Elgg requires a FQDN for the email address.
-#ENV ELGG_SITE_EMAIL=${ELGG_SITE_EMAIL:-"no-reply@myelgg.org"}
-
 # admin user setup
 ENV ELGG_DISPLAY_NAME=${ELGG_DISPLAY_NAME:-"Admin"}
 ENV ELGG_EMAIL=${ELGG_EMAIL:-"admin@myelgg.org"}
 ENV ELGG_USERNAME=${ELGG_USERNAME:-"admin"}
-ENV ELGG_PASSWORD=${ELGG_PASSWORD:-"123123"}
+ENV ELGG_PASSWORD=${ELGG_PASSWORD:-"admin-pass"}
 
 # optional for installation
 ENV ELGG_DB_PREFIX=${ELGG_DB_PREFIX:-"elgg_"}

docker-compose.yml → 2.0.0-beta.3/docker-compose.yml

@@ -6,9 +6,13 @@ web:
     - mysql
   volumes:
     - ~/www/Elgg/:/var/www/html/
-    - ~/www/elgg-docker/:/elgg-docker/
+  environment:
+    MYSQL_USER: root
+    MYSQL_PASS: root-pass
+    ELGG_USERNAME: admin
+    ELGG_PASSWORD: admin-pass
 mysql:
   image: mysql:5.6  
   environment:
     MYSQL_DATABASE: elgg
-    MYSQL_ROOT_PASSWORD: 123123
+    MYSQL_ROOT_PASSWORD: root-pass

2.0.0-beta.3/elgg-install.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+# Wait for database to get available
+
+MYSQL_LOOPS="20"
+MYSQL_HOST="$ELGG_DB_HOST"
+MYSQL_USER="$MYSQL_USER"
+MYSQL_PASS="$MYSQL_PASS"
+ELGG_DB_HOST="$ELGG_DB_HOST"
+ELGG_DB_NAME="$ELGG_DB_NAME"
+
+
+
+#wait for mysql
+i=0
+while ! netcat $MYSQL_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."
+    exit 0
+  fi
+  echo "$(date) - waiting for ${MYSQL_HOST}:${MYSQL_PORT}... 1/$MYSQL_LOOPS."
+  sleep 1
+done
+
+# Recreates the base Rlgg
+if ! [ $(mysql -N -s -u $MYSQL_USER -p $MYSQL_PASS -h $MYSQL_HOST -e \
+    "select count(*) from information_schema.tables where \
+        table_schema='$ELGG_DB_NAME' and table_name='elgg_entities';") -eq 1 ]; then
+    
+    mysql -u $MYSQL_USER -p $MYSQL_PASS -h $MYSQL_HOST -e "DROP DATABASE $ELGG_DB_NAME; CREATE DATABASE $ELGG_DB_NAME;"
+fi
+
+php	/elgg-docker/elgg-install.php

elgg-install-wrapper.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-# Wait for database to get available
-
-MYSQL_LOOPS="20"
-MYSQL_HOST="$ELGG_DB_HOST"
-
-
-#wait for mysql
-i=0
-while ! netcat $MYSQL_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."
-    exit 0
-  fi
-  echo "$(date) - waiting for ${MYSQL_HOST}:${MYSQL_PORT}... 1/$MYSQL_LOOPS."
-  sleep 1
-done
-
-php	/elgg-docker/elgg-install.php