From 905d9f0d46cbda7e97aaa05bf7560da7afe20573 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 3 Jan 2016 16:21:32 +0100
Subject: [PATCH] VM2 on J2, using php 5.4

---
 j2vm2_full/Dockerfile | 7 ++++++-
 j2vm3_full/Dockerfile | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/j2vm2_full/Dockerfile b/j2vm2_full/Dockerfile
index db11608..c5a9117 100644
--- a/j2vm2_full/Dockerfile
+++ b/j2vm2_full/Dockerfile
@@ -1,9 +1,10 @@
-FROM php:5.6-apache
+FROM php:5.4-apache
 MAINTAINER Reinhold Kainhofer <reinhold@kainhofer.com>
 
 # Enable Apache Rewrite Module
 RUN a2enmod rewrite
 
+
 # Install PHP extensions
 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev zip unzip && rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
@@ -12,6 +13,10 @@ RUN docker-php-ext-install mysqli
 
 VOLUME /var/www/html
 
+# Install MySQL (will only be started if needed)
+# RUN apt-get update && apt-get install -y mysql-server && rm -rf /var/lib/apt/lists/*
+
+
 # Define Joomla version and expected SHA1 signature
 ENV VMFULL_VERSION 2.6.14
 ENV VMFULL_MD5 0a589d9db3831ae4e3d8eb95db28aeee
diff --git a/j2vm3_full/Dockerfile b/j2vm3_full/Dockerfile
index 6614d78..fab2af6 100644
--- a/j2vm3_full/Dockerfile
+++ b/j2vm3_full/Dockerfile
@@ -4,6 +4,7 @@ MAINTAINER Reinhold Kainhofer <reinhold@kainhofer.com>
 # Enable Apache Rewrite Module
 RUN a2enmod rewrite
 
+
 # Install PHP extensions
 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev zip unzip && rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-- 
GitLab