entrypoint: remove references to `entrypoint.sh` from base image
This commit is contained in:
parent
65f21b8146
commit
4e1c94a23e
|
|
@ -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>
|
MAINTAINER Bitnami <containers@bitnami.com>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,13 @@
|
||||||
#!/bin/bash
|
#!/bin/bash -e
|
||||||
set -e
|
. /opt/bitnami/base/functions
|
||||||
|
. /opt/bitnami/base/helpers
|
||||||
|
|
||||||
function initialize {
|
print_welcome_page
|
||||||
# Package can be "installed" or "unpacked"
|
check_for_updates &
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||||
|
nami_initialize apache php osclass
|
||||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
info "Starting osclass..."
|
||||||
for module in apache php osclass; do
|
|
||||||
initialize $module
|
|
||||||
done
|
|
||||||
echo "Starting application ..."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec /entrypoint.sh "$@"
|
exec tini -- "$@"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue