From d87e6609ba3c29e5369ee0ccfd71c6518c3213cb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 3 May 2017 12:11:16 +0000
Subject: [PATCH] 0.11.8-r1 release

Update image to version 0.11.8-r1
---
 bitnami/ghost/0/.dockerignore            |  0
 bitnami/ghost/0/Dockerfile               | 47 ++++++++++++------------
 bitnami/ghost/0/rootfs/app-entrypoint.sh |  2 +
 bitnami/ghost/0/rootfs/ghost-inputs.json | 20 +++++-----
 4 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 bitnami/ghost/0/.dockerignore

diff --git a/bitnami/ghost/0/.dockerignore b/bitnami/ghost/0/.dockerignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/bitnami/ghost/0/Dockerfile b/bitnami/ghost/0/Dockerfile
index f40039f051a9..834e4d187597 100644
--- a/bitnami/ghost/0/Dockerfile
+++ b/bitnami/ghost/0/Dockerfile
@@ -1,38 +1,37 @@
-FROM bitnami/minideb-extras:jessie-r13
-
+FROM bitnami/minideb-extras:jessie-r14
 MAINTAINER Bitnami <containers@bitnami.com>
 
-ENV BITNAMI_APP_NAME=ghost \
-    BITNAMI_IMAGE_VERSION=0.11.8-r0 \
-    PATH=/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:$PATH
+ENV BITNAMI_APP_NAME="ghost" \
+    BITNAMI_IMAGE_VERSION="0.11.8-r1" \
+    BLOG_TITLE="User's Blog" \
+    GHOST_EMAIL="user@example.com" \
+    GHOST_HOST="" \
+    GHOST_PASSWORD="bitnami1" \
+    GHOST_PORT="80" \
+    GHOST_USERNAME="user" \
+    MARIADB_HOST="mariadb" \
+    MARIADB_PASSWORD="" \
+    MARIADB_PORT="3306" \
+    MARIADB_USER="root" \
+    PATH="/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:$PATH" \
+    SMTP_HOST="" \
+    SMTP_PASSWORD="" \
+    SMTP_PORT="" \
+    SMTP_SERVICE="" \
+    SMTP_USER=""
 
-# System packages required
-RUN install_packages libc6 zlib1g libssl1.0.0 libncurses5 libtinfo5 libstdc++6 libgcc1 libbz2-1.0 libreadline6 ghostscript imagemagick libmysqlclient18
-
-# Additional modules required
-RUN bitnami-pkg install mysql-client-10.1.22-3 --checksum 9e881a7c404f658c93abd665ecd1372f61a591d784e6456c64c0129358a7ff1a
+# Install required system packages and dependencies
+RUN install_packages ghostscript imagemagick libbz2-1.0 libc6 libgcc1 libmysqlclient18 libncurses5 libreadline6 libssl1.0.0 libstdc++6 libtinfo5 zlib1g
 RUN bitnami-pkg install node-4.8.2-0 --checksum 3e5b6898fee0ef9ef59ebecd4eb23fb1b2cc99215d4fdfd49c8c3e6b49bd86e3
-
-# Install ghost
+RUN bitnami-pkg install mysql-client-10.1.22-3 --checksum 9e881a7c404f658c93abd665ecd1372f61a591d784e6456c64c0129358a7ff1a
 RUN bitnami-pkg unpack ghost-0.11.8-0 --checksum 8a220ca57565dd6a69f50a015f70c9e9d4f76b504310ca13ac80600d33ee1df9
 
 COPY rootfs /
 
-ENV GHOST_PORT="80" \
-    GHOST_USERNAME="user" \
-    GHOST_PASSWORD="bitnami1" \
-    GHOST_EMAIL="user@example.com" \
-    BLOG_TITLE="User's Blog" \
-    MARIADB_USER="root" \
-    MARIADB_HOST="mariadb" \
-    MARIADB_PORT="3306"
-
 VOLUME ["/bitnami/ghost"]
 
 EXPOSE 2368
 
-ENTRYPOINT ["/app-entrypoint.sh"]
-
 WORKDIR /opt/bitnami/ghost
-
+ENTRYPOINT ["/app-entrypoint.sh"]
 CMD ["/run.sh"]
diff --git a/bitnami/ghost/0/rootfs/app-entrypoint.sh b/bitnami/ghost/0/rootfs/app-entrypoint.sh
index 74e532655444..14b34a64ef67 100755
--- a/bitnami/ghost/0/rootfs/app-entrypoint.sh
+++ b/bitnami/ghost/0/rootfs/app-entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+
 . /opt/bitnami/base/functions
 . /opt/bitnami/base/helpers
 
@@ -7,6 +8,7 @@ check_for_updates &
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
   nami_initialize ghost
+  info "Starting ghost... "
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/ghost/0/rootfs/ghost-inputs.json b/bitnami/ghost/0/rootfs/ghost-inputs.json
index 4de5814f1370..9b16bcdd309b 100644
--- a/bitnami/ghost/0/rootfs/ghost-inputs.json
+++ b/bitnami/ghost/0/rootfs/ghost-inputs.json
@@ -1,17 +1,17 @@
 {
-  "username": "{{$global.env.GHOST_USERNAME}}",
-  "password": "{{$global.env.GHOST_PASSWORD}}",
-  "email": "{{$global.env.GHOST_EMAIL}}",
   "blogTitle": "{{$global.env.BLOG_TITLE}}",
-  "host": "{{$global.env.GHOST_HOST}}",
-  "port": "{{$global.env.GHOST_PORT}}",
-  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
   "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}",
+  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
   "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
   "databaseServerPort": "{{$global.env.MARIADB_PORT}}",
+  "email": "{{$global.env.GHOST_EMAIL}}",
+  "host": "{{$global.env.GHOST_HOST}}",
+  "password": "{{$global.env.GHOST_PASSWORD}}",
+  "port": "{{$global.env.GHOST_PORT}}",
   "smtpHost": "{{$global.env.SMTP_HOST}}",
-  "smtpPort": "{{$global.env.SMTP_PORT}}",
-  "smtpUser": "{{$global.env.SMTP_USER}}",
   "smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
-  "smtpService": "{{$global.env.SMTP_SERVICE}}"
-}
+  "smtpPort": "{{$global.env.SMTP_PORT}}",
+  "smtpService": "{{$global.env.SMTP_SERVICE}}",
+  "smtpUser": "{{$global.env.SMTP_USER}}",
+  "username": "{{$global.env.GHOST_USERNAME}}"
+}
\ No newline at end of file