From 75ba7d880f428041a07a6190647d01d204506b6b Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 14 Sep 2016 11:20:12 +0800
Subject: [PATCH] upgrade joomla to 3.6.2

---
 joomla/Dockerfile | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/joomla/Dockerfile b/joomla/Dockerfile
index 837d4c4..eaeb11d 100644
--- a/joomla/Dockerfile
+++ b/joomla/Dockerfile
@@ -5,21 +5,20 @@
 FROM php:5.6-apache
 MAINTAINER kev<noreply@easypi.info>
 
-RUN apt-get update && apt-get install -y curl unzip bzip2 libpq-dev libpng12-dev libjpeg-dev \
-        && rm -rf /var/lib/apt/lists/* \
-        && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-        && docker-php-ext-install gd mysqli pgsql
+RUN set -xe \
+    && apt-get update && apt-get install -y curl unzip bzip2 libpq-dev libpng12-dev libjpeg-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+    && docker-php-ext-install gd mysqli pgsql
 
-WORKDIR /var/www/html
-
-ENV JOOMLA_VERSION 3.4.1
+ENV JOOMLA_VERSION 3.6.2
 ENV JOOMLA_URL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.gz
-ENV JOOMLA_MD5 ea0a13638123a300ecc0759e425a6172
+ENV JOOMLA_MD5 496edf7dd1f171711b2fcd72f11523bc
 ENV JOOMLA_FILE Joomla.tar.gz
 
-RUN curl -fSL ${JOOMLA_URL} -o ${JOOMLA_FILE} \
-        && echo "${JOOMLA_MD5} ${JOOMLA_FILE}" | md5sum -c - \
-        && tar -xzf ${JOOMLA_FILE} \
-        && rm ${JOOMLA_FILE} \
-        && chown -R www-data:www-data .
-
+RUN set -xe \
+    && curl -fSL ${JOOMLA_URL} -o ${JOOMLA_FILE} \
+    && echo "${JOOMLA_MD5}  ${JOOMLA_FILE}" | md5sum -c - \
+    && tar -xzf ${JOOMLA_FILE} \
+    && rm ${JOOMLA_FILE} \
+    && chown -R www-data:www-data .