entrypoint: remove references to `entrypoint.sh` from base image
This commit is contained in:
parent
004404cddc
commit
6be0946cbc
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 dokuwiki; do
|
||||
initialize $module
|
||||
done
|
||||
echo "Starting application ..."
|
||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
nami_initialize apache php dokuwiki
|
||||
info "Starting dokuwiki..."
|
||||
fi
|
||||
|
||||
exec /entrypoint.sh "$@"
|
||||
exec tini -- "$@"
|
||||
|
|
|
|||
Loading…
Reference in New Issue