From d18616a8693aa546576ff59d6ee111e543f4d47e Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Feb 2017 17:50:46 +0530
Subject: [PATCH] entrypoint: remove references to `entrypoint.sh` from base
 image

---
 bitnami/magento/rootfs/app-entrypoint.sh | 33 +++++++-----------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/bitnami/magento/rootfs/app-entrypoint.sh b/bitnami/magento/rootfs/app-entrypoint.sh
index 6ee7c3ba7204..20358421545b 100755
--- a/bitnami/magento/rootfs/app-entrypoint.sh
+++ b/bitnami/magento/rootfs/app-entrypoint.sh
@@ -1,28 +1,13 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
 
-function initialize {
-    # Package can be "installed" or "unpacked"
-    status=`nami inspect $1`
-    if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
-        # Clean up inputs
-        inputs=""
-        if [[ -f /$1-inputs.json ]]; then
-            inputs=--inputs-file=/$1-inputs.json
-        fi
-        nami initialize $1 $inputs
-    fi
-}
+print_welcome_page
+check_for_updates &
 
-# Adding cron entries
-ln -fs /opt/bitnami/magento/conf/cron /etc/cron.d/magento
-
-
-if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-   for module in apache php magento; do
-    initialize $module
-   done
-   echo "Starting application ..."
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize apache php magento
+  info "Starting magento..."
 fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"