From 88c0517ce10690049ee19fa55e532b631162e0a4 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 4 Sep 2016 20:42:50 +0530 Subject: [PATCH 1/4] `harpoon` has been renamed to `nami` --- bitnami/drupal/Dockerfile | 4 ++-- bitnami/drupal/rootfs/app-entrypoint.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/Dockerfile index 2adebe867665..e2a3da32edb9 100644 --- a/bitnami/drupal/Dockerfile +++ b/bitnami/drupal/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/ubuntu:14.04-r8 +FROM gcr.io/stacksmith-images/ubuntu:14.04-r9 MAINTAINER Bitnami @@ -24,4 +24,4 @@ EXPOSE 80 443 ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["harpoon", "start", "--foreground", "apache"] +CMD ["nami", "start", "--foreground", "apache"] diff --git a/bitnami/drupal/rootfs/app-entrypoint.sh b/bitnami/drupal/rootfs/app-entrypoint.sh index 8b67cf5a619e..27fe6a395316 100755 --- a/bitnami/drupal/rootfs/app-entrypoint.sh +++ b/bitnami/drupal/rootfs/app-entrypoint.sh @@ -3,12 +3,12 @@ set -e function initialize { # Package can be "installed" or "unpacked" - status=`harpoon inspect $1` + status=`nami inspect $1` if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then if [[ -f /$1-inputs.json ]]; then inputs=--inputs-file=/$1-inputs.json fi - harpoon initialize $1 $inputs + nami initialize $1 $inputs fi } @@ -20,7 +20,7 @@ export MARIADB_USER=${MARIADB_USER:-"root"} export MARIADB_HOST=${MARIADB_HOST:-"mariadb"} export MARIADB_PORT=${MARIADB_PORT:-"3306"} -if [[ "$1" == "harpoon" && "$2" == "start" ]]; then +if [[ "$1" == "nami" && "$2" == "start" ]]; then for module in apache drupal; do initialize $module done From 2a4369e521927fe824f940c3a15325cdc9d47f14 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 4 Sep 2016 20:45:58 +0530 Subject: [PATCH 2/4] initialize `php` module at runtime --- bitnami/drupal/Dockerfile | 4 ++-- bitnami/drupal/docker-compose.yml | 3 +++ bitnami/drupal/rootfs/app-entrypoint.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/Dockerfile index e2a3da32edb9..d65317eb45d2 100644 --- a/bitnami/drupal/Dockerfile +++ b/bitnami/drupal/Dockerfile @@ -8,7 +8,7 @@ ENV BITNAMI_APP_NAME=drupal \ PATH=/opt/bitnami/php/bin:/opt/bitnami/drush:/opt/bitnami/mysql/bin/:$PATH # Additional modules required -RUN bitnami-pkg install php-5.6.24-1 --checksum 6cdb5736757bfe0a950034d0dc85a48c3e4ab02bec64c90f0c44454069362e65 +RUN bitnami-pkg unpack php-5.6.24-1 --checksum 6cdb5736757bfe0a950034d0dc85a48c3e4ab02bec64c90f0c44454069362e65 RUN bitnami-pkg unpack apache-2.4.23-1 --checksum c8d14a79313c5e47dbf617e9a55e88ff91d8361357386bab520aabccd35c59d8 RUN bitnami-pkg install libphp-5.6.21-2 --checksum 83d19b750b627fa70ed9613504089732897a48e1a7d304d8d73dec61a727b222 RUN bitnami-pkg install mysql-client-10.1.13-4 --checksum 14b45c91dd78b37f0f2366712cbe9bfdf2cb674769435611955191a65dbf4976 @@ -18,7 +18,7 @@ RUN bitnami-pkg unpack drupal-8.1.8-0 --checksum 9f9b48d08865779bc3ba785432f823e COPY rootfs / -VOLUME ["/bitnami/drupal", "/bitnami/apache"] +VOLUME ["/bitnami/drupal", "/bitnami/apache", "/bitnami/php"] EXPOSE 80 443 diff --git a/bitnami/drupal/docker-compose.yml b/bitnami/drupal/docker-compose.yml index b9fb4f03d760..55fc9a2bf938 100644 --- a/bitnami/drupal/docker-compose.yml +++ b/bitnami/drupal/docker-compose.yml @@ -12,6 +12,7 @@ services: volumes: - 'drupal_data:/bitnami/drupal' - '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/drupal/rootfs/app-entrypoint.sh b/bitnami/drupal/rootfs/app-entrypoint.sh index 27fe6a395316..ca4ecbac9e0f 100755 --- a/bitnami/drupal/rootfs/app-entrypoint.sh +++ b/bitnami/drupal/rootfs/app-entrypoint.sh @@ -21,7 +21,7 @@ export MARIADB_HOST=${MARIADB_HOST:-"mariadb"} export MARIADB_PORT=${MARIADB_PORT:-"3306"} if [[ "$1" == "nami" && "$2" == "start" ]]; then - for module in apache drupal; do + for module in apache php drupal; do initialize $module done echo "Starting application ..." From c101b0e6765fdcbb6a76b433b6ebcacc214d76f5 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 4 Sep 2016 20:46:31 +0530 Subject: [PATCH 3/4] Dockerfile: updated `apache` and `php` modules --- bitnami/drupal/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/Dockerfile index d65317eb45d2..f59b1a0ff578 100644 --- a/bitnami/drupal/Dockerfile +++ b/bitnami/drupal/Dockerfile @@ -8,8 +8,8 @@ ENV BITNAMI_APP_NAME=drupal \ PATH=/opt/bitnami/php/bin:/opt/bitnami/drush:/opt/bitnami/mysql/bin/:$PATH # Additional modules required -RUN bitnami-pkg unpack php-5.6.24-1 --checksum 6cdb5736757bfe0a950034d0dc85a48c3e4ab02bec64c90f0c44454069362e65 -RUN bitnami-pkg unpack apache-2.4.23-1 --checksum c8d14a79313c5e47dbf617e9a55e88ff91d8361357386bab520aabccd35c59d8 +RUN bitnami-pkg unpack apache-2.4.23-2 --checksum be3c28581f363e240f04c2d32bcf2d4a5ea0926722bb23ab9f5dfb38bde22bac +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 From 1c7fd45faa61ea3e8dc18c28b1e70805b128c6ff Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 4 Sep 2016 23:39:46 +0530 Subject: [PATCH 4/4] entrypoint: clear inputs --- bitnami/drupal/rootfs/app-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bitnami/drupal/rootfs/app-entrypoint.sh b/bitnami/drupal/rootfs/app-entrypoint.sh index ca4ecbac9e0f..eff3ed7e0dad 100755 --- a/bitnami/drupal/rootfs/app-entrypoint.sh +++ b/bitnami/drupal/rootfs/app-entrypoint.sh @@ -5,6 +5,7 @@ function initialize { # Package can be "installed" or "unpacked" status=`nami inspect $1` if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then + inputs="" if [[ -f /$1-inputs.json ]]; then inputs=--inputs-file=/$1-inputs.json fi