From 8ab77d1683c0b4e9649d28ceefcfd0fa3e2abc45 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Tue, 14 Feb 2017 20:16:42 +0530
Subject: [PATCH] entrypoint: remove references to `entrypoint.sh` from base
 image

---
 bitnami/node/Dockerfile               | 26 +++-----------------------
 bitnami/node/rootfs/app-entrypoint.sh | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/bitnami/node/Dockerfile b/bitnami/node/Dockerfile
index 84c28f7f6add..a1a936f59e7b 100644
--- a/bitnami/node/Dockerfile
+++ b/bitnami/node/Dockerfile
@@ -1,27 +1,7 @@
-## BUILDING
-##   (from project root directory)
-##   $ docker build -t node-js-for-bitnami-bitnami-docker-node .
-##
-## RUNNING
-##   $ docker run -p 3000:3000 node-js-for-bitnami-bitnami-docker-node
-##
-## CONNECTING
-##   Lookup the IP of your active docker host using:
-##     $ docker-machine ip $(docker-machine active)
-##   Connect to the container at DOCKER_IP:3000
-##     replacing DOCKER_IP for the IP of your active docker host
-
-FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r8
+FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
-ENV STACKSMITH_STACK_ID="npx76xt" \
-    STACKSMITH_STACK_NAME="Node.js for bitnami/bitnami-docker-node" \
-    STACKSMITH_STACK_PRIVATE="1"
-
-## STACKSMITH-END: Modifications below this line will be unchanged when regenerating
-
-
 # System packages required
 RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18
 
@@ -33,13 +13,13 @@ COPY rootfs /
 ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \
     NODE_PATH=/opt/bitnami/node/lib/node_modules
 
-
 ENV BITNAMI_APP_NAME=node \
     BITNAMI_IMAGE_VERSION=7.5.0-r0
 
-EXPOSE 3000
 WORKDIR /app
 
+EXPOSE 3000
+
 ENTRYPOINT ["/app-entrypoint.sh"]
 
 CMD ["node"]
diff --git a/bitnami/node/rootfs/app-entrypoint.sh b/bitnami/node/rootfs/app-entrypoint.sh
index 368ebfa6fc6c..2ffec02ca62a 100755
--- a/bitnami/node/rootfs/app-entrypoint.sh
+++ b/bitnami/node/rootfs/app-entrypoint.sh
@@ -1,19 +1,13 @@
 #!/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
-        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 &
 
-for module in node; do
-  initialize $module
-done
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize node
+  info "Starting node..."
+fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"