From 9945224196d5e39083effa8a62b6895233533797 Mon Sep 17 00:00:00 2001
From: Alejandro Ruiz <alejandro@bitnami.com>
Date: Thu, 22 Oct 2015 17:19:57 +0000
Subject: [PATCH] Migration to s6

---
 bitnami/drupal/Dockerfile |  6 ++----
 bitnami/drupal/README.md  | 10 ++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/Dockerfile
index 50edceccdd62..73cd7244eb43 100644
--- a/bitnami/drupal/Dockerfile
+++ b/bitnami/drupal/Dockerfile
@@ -2,7 +2,7 @@ FROM bitnami/base-apps-ubuntu:14.04
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=drupal \
-    BITNAMI_APP_VERSION=7.40-0 \
+    BITNAMI_APP_VERSION=7.41-0 \
     BITNAMI_APP_USER=bitnami \
     BITNAMI_APPLICATION_USER=user \
     BITNAMI_APPLICATION_PASSWORD=bitnami \
@@ -10,9 +10,7 @@ ENV BITNAMI_APP_NAME=drupal \
 
 #Download latest Drupal Stack from bitnami.com
 RUN $BITNAMI_PREFIX/install.sh \
-    --base_user $BITNAMI_APPLICATION_USER --base_password $BITNAMI_APPLICATION_PASSWORD --apache_mpm_mode event --enable_phpfpm 1 --logrotate_install 1 --monit_install 1 && \
+    --base_user $BITNAMI_APPLICATION_USER --base_password $BITNAMI_APPLICATION_PASSWORD --apache_mpm_mode event --enable_phpfpm 1 --logrotate_install 1 && \
     rm $BITNAMI_PREFIX/install.sh
 
 EXPOSE 80 443 22
-
-CMD ["/bin/bash", "/start.sh"]
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 4e5ff155ef4b..389013fbb98d 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -1,3 +1,5 @@
+[![Build Status](http://bitnami-container-builds.bitnamiapp.com/jenkins/buildStatus/icon?job=docker-drupal)](http://bitnami-container-builds.bitnamiapp.com/jenkins/job/docker-drupal/)
+
 # Bitnami Docker Image for Drupal
 This is an all-in-one container for [Bitnami Drupal Stack](https://bitnami.com/stack/drupal). It includes all the required dependencies to run Drupal in a container in less than 1 minute. 
 
@@ -70,9 +72,9 @@ docker exec -it drupal /opt/bitnami/scripts/logs.sh mysql
 In order to backup your containers you could pack the `/opt/bitnami` directory and copy it to the host by running the following commands:
 
 ```
-docker exec -it drupal /opt/bitnami/ctlscript.sh stop
+docker exec -it drupal /services.sh stop
 docker exec -it drupal tar -pczvf /tmp/drupal-backup.tar.gz /opt/bitnami
-docker exec -it drupal /opt/bitnami/ctlscript.sh start
+docker exec -it drupal /services.sh start
 docker cp drupal:/tmp/drupal-backup.tar.gz /path/to/destination/directory
 ```
 NOTE: this commands assume that your container is named `drupal`.
@@ -83,9 +85,9 @@ In order to restore a previously created backup of your container, you woild nee
 
 ```
 docker cp /path/to/drupal-backup.tar.gz drupal:/tmp/drupal-backup.tar.gz
-docker exec -it drupal /opt/bitnami/ctlscript.sh stop
+docker exec -it drupal /services.sh stop
 docker exec -it drupal tar -xzvf /tmp/drupal-backup.tar.gz
-docker exec -it drupal /opt/bitnami/ctlscript.sh start
+docker exec -it drupal /services.sh start
 ```
 NOTE: this commands assume that your container is named `drupal`.