From ee7becb7b0dba00f3ad76ca22c4b111dd9daf1aa Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 18 Dec 2016 14:44:40 +0100
Subject: [PATCH] Update to J3.6.2 and VM 3.0.18

---
 j3vm3_full/Dockerfile           |  8 ++++----
 j3vm3_full/docker-entrypoint.sh | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/j3vm3_full/Dockerfile b/j3vm3_full/Dockerfile
index c74fff5..e36a838 100644
--- a/j3vm3_full/Dockerfile
+++ b/j3vm3_full/Dockerfile
@@ -24,10 +24,10 @@ RUN apt-get install -y supervisor
 
 
 # Define Joomla version and expected SHA1 signature
-ENV J_VERSION 3.5.1
-ENV VM_VERSION 3.0.16
-ENV VM_DLDIR 1001
-ENV VM_MD5 3a445fc3db1cb0373359bf7a36aec4c8
+ENV J_VERSION 3.6.2
+ENV VM_VERSION 3.0.18
+ENV VM_DLDIR 1023
+ENV VM_MD5 2a94ed631d8b6765e8b4f7983e53c24c
 ENV VM_POSTFIX ""
 
 # Download package and extract to web volume
diff --git a/j3vm3_full/docker-entrypoint.sh b/j3vm3_full/docker-entrypoint.sh
index 5fb3093..6c1bf43 100755
--- a/j3vm3_full/docker-entrypoint.sh
+++ b/j3vm3_full/docker-entrypoint.sh
@@ -120,12 +120,12 @@ if [[ ! -e "/etc/opentools-docker-configured" ]]; then
 		DBPREFIX="--dbprefix=\"${JOOMLA_DB_PREFIX}_\""
 	fi
 
-	echo "Installing Joomla/VirtueMart site $JOOMLA_SITE_NAME using the CLI and database host $JOOMLA_DB_HOST"
-	php ./installation/install.php --name "$JOOMLA_SITE_NAME" \
-		--admin-user "$JOOMLA_ADMIN_USER" --admin-pass "$JOOMLA_ADMIN_PASSWORD" --admin-email "$JOOMLA_ADMIN_EMAIL" \
-		--db-host "$JOOMLA_DB_HOST" --db-user "$JOOMLA_DB_USER" --db-pass "$JOOMLA_DB_PASSWORD" --db-name "$JOOMLA_DB_NAME" $DBPREFIX  && \
-		rm -rf "./installation/"
-	chown www-data:www-data configuration.php
+#	echo "Installing Joomla/VirtueMart site $JOOMLA_SITE_NAME using the CLI and database host $JOOMLA_DB_HOST"
+#	php ./installation/install.php --name "$JOOMLA_SITE_NAME" \
+#		--admin-user "$JOOMLA_ADMIN_USER" --admin-pass "$JOOMLA_ADMIN_PASSWORD" --admin-email "$JOOMLA_ADMIN_EMAIL" \
+#		--db-host "$JOOMLA_DB_HOST" --db-user "$JOOMLA_DB_USER" --db-pass "$JOOMLA_DB_PASSWORD" --db-name "$JOOMLA_DB_NAME" $DBPREFIX  && \
+#		rm -rf "./installation/"
+#	chown www-data:www-data configuration.php
 
 
 	for p in /usr/src/virtuemart/*.zip; do
-- 
GitLab