From 0ea9f4d2306f817ac3961594322a6b63cc8eeecb Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Sun, 4 Sep 2016 22:13:20 +0530
Subject: [PATCH] initialize `php` module at runtime

---
 bitnami/moodle/Dockerfile               | 4 ++--
 bitnami/moodle/docker-compose.yml       | 3 +++
 bitnami/moodle/rootfs/app-entrypoint.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bitnami/moodle/Dockerfile b/bitnami/moodle/Dockerfile
index 8017b6cec2bb..3f2a6a427513 100644
--- a/bitnami/moodle/Dockerfile
+++ b/bitnami/moodle/Dockerfile
@@ -8,7 +8,7 @@ ENV BITNAMI_APP_NAME=moodle \
 
 # Additional modules required
 RUN bitnami-pkg unpack apache-2.4.23-2 --checksum be3c28581f363e240f04c2d32bcf2d4a5ea0926722bb23ab9f5dfb38bde22bac
-RUN bitnami-pkg install php-5.6.25-0 --checksum f0e8d07d155abdb5d6843931d3ffbf9b4208fff248c409444fdd5a8e3a3da01d
+RUN bitnami-pkg unpack php-5.6.25-0 --checksum f0e8d07d155abdb5d6843931d3ffbf9b4208fff248c409444fdd5a8e3a3da01d
 RUN bitnami-pkg install libphp-5.6.21-2 --checksum 83d19b750b627fa70ed9613504089732897a48e1a7d304d8d73dec61a727b222
 RUN bitnami-pkg install mysql-client-10.1.13-4 --checksum 14b45c91dd78b37f0f2366712cbe9bfdf2cb674769435611955191a65dbf4976
 
@@ -17,7 +17,7 @@ RUN bitnami-pkg unpack moodle-3.1.0-1 --checksum b397661d41a2970ef4f8e520486b835
 
 COPY rootfs /
 
-VOLUME ["/bitnami/moodle", "/bitnami/apache"]
+VOLUME ["/bitnami/moodle", "/bitnami/apache", "/bitnami/php"]
 
 EXPOSE 80 443
 
diff --git a/bitnami/moodle/docker-compose.yml b/bitnami/moodle/docker-compose.yml
index 9809c70adafa..e78c6ffc7d12 100644
--- a/bitnami/moodle/docker-compose.yml
+++ b/bitnami/moodle/docker-compose.yml
@@ -12,6 +12,7 @@ services:
     volumes:
       - 'moodle_data:/bitnami/moodle'
       - 'apache_data:/bitnami/apache'
+      - 'php_data:/bitnami/php'
     depends_on:
       - mariadb
 volumes:
@@ -21,3 +22,5 @@ volumes:
     driver: local
   apache_data:
     driver: local
+  php_data:
+    driver: local
diff --git a/bitnami/moodle/rootfs/app-entrypoint.sh b/bitnami/moodle/rootfs/app-entrypoint.sh
index 8ddb24b412c2..1caa56481c65 100755
--- a/bitnami/moodle/rootfs/app-entrypoint.sh
+++ b/bitnami/moodle/rootfs/app-entrypoint.sh
@@ -27,7 +27,7 @@ export MOODLE_SITENAME=${MOODLE_SITENAME:-"New Site"}
 
 
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-   for module in apache moodle; do
+   for module in apache php moodle; do
     initialize $module
    done
    echo "Starting application ..."