entrypoint: remove references to entrypoint.sh from base image

bitnami/laravel/Dockerfile

@@ -1,24 +1,7 @@
-## BUILDING
-##   (from project root directory)
-##   $ docker build -t bitnami-bitnami-docker-laravel .
-##
-## RUNNING
-##   $ docker run -p 9000:9000 bitnami-bitnami-docker-laravel
-##
-## CONNECTING
-##   Lookup the IP of your active docker host using:
-##     $ docker-machine ip $(docker-machine active)
-##   Connect to the container at DOCKER_IP:9000
-##     replacing DOCKER_IP for the IP of your active docker host
-
-FROM gcr.io/stacksmith-images/minideb:jessie-r8
+FROM gcr.io/stacksmith-images/minideb:jessie-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
-ENV STACKSMITH_STACK_ID="top24h8" \
-    STACKSMITH_STACK_NAME="bitnami/bitnami-docker-laravel" \
-    STACKSMITH_STACK_PRIVATE="1"
-
 RUN bitnami-pkg install node-6.6.0-1 --checksum 36f42bb71b35f95db3bb21d088fbd9438132fb2a7fb4d73b5951732db9a6771e
 RUN bitnami-pkg install php-5.6.26-1 --checksum b7a72ae78f9b19352bd400dfe027465c88a8643c0e5d9753f8d12f4ebae542a2
 
@@ -35,9 +18,12 @@ RUN mkdir /tmp/app && cd /tmp/app && composer create-project "laravel/laravel=5.
 ENV BITNAMI_APP_NAME=laravel
 ENV BITNAMI_IMAGE_VERSION=5.2.31-r9
 
+COPY rootfs/ /
+
 WORKDIR /app
+
 EXPOSE 3000
 
-COPY rootfs/ /
 ENTRYPOINT ["/app-entrypoint.sh"]
+
 CMD ["php", "artisan", "serve", "--host=0.0.0.0", "--port=3000"]

bitnami/laravel/rootfs/app-entrypoint.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
+. /opt/bitnami/base/functions
 
 INIT_SEM=/tmp/initialized.sem
 PACKAGE_FILE=/app/composer.json
@@ -38,14 +38,10 @@ setup_db() {
   php artisan migrate
 }
 
-log () {
-  echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1."
-}
-
 if [ "${1}" == "php" -a "$2" == "artisan" -a "$3" == "serve" ]; then
   if ! app_present; then
     log "Creating laravel application"
-    \cp -r /tmp/app/ /
+    cp -r /tmp/app/ /
   fi
 
   if ! dependencies_up_to_date; then
@@ -72,4 +68,4 @@ if [ "${1}" == "php" -a "$2" == "artisan" -a "$3" == "serve" ]; then
   fi
 fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"