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

---
 bitnami/osclass/Dockerfile               |  2 +-
 bitnami/osclass/rootfs/app-entrypoint.sh | 31 +++++++-----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/bitnami/osclass/Dockerfile b/bitnami/osclass/Dockerfile
index 9ed92e8bf9c9..a53ae9ce2510 100644
--- a/bitnami/osclass/Dockerfile
+++ b/bitnami/osclass/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/minideb:jessie-r8
+FROM gcr.io/stacksmith-images/minideb:jessie-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
diff --git a/bitnami/osclass/rootfs/app-entrypoint.sh b/bitnami/osclass/rootfs/app-entrypoint.sh
index a1f54c30de38..8990ed160de3 100755
--- a/bitnami/osclass/rootfs/app-entrypoint.sh
+++ b/bitnami/osclass/rootfs/app-entrypoint.sh
@@ -1,26 +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 &
 
-
-
-if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-   for module in apache php osclass; do
-    initialize $module
-   done
-   echo "Starting application ..."
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize apache php osclass
+  info "Starting osclass..."
 fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"