entrypoint: remove references to entrypoint.sh from base image

This commit is contained in:
Sameer Naik
2017-02-14 15:34:18 +05:30
parent 0f6ca380bf
commit 5d50d15af0
2 changed files with 10 additions and 21 deletions

View File

@@ -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>

View File

@@ -1,24 +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 prestashop; do
initialize $module
done
echo "Starting application ..."
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
nami_initialize apache php prestashop
info "Starting prestashop..."
fi
exec /entrypoint.sh "$@"
exec tini -- "$@"