entrypoint: stop referencing the default `entrypoint.sh` script from the base image

This commit is contained in:
Sameer Naik 2017-02-08 15:14:40 +05:30
parent ead868ce11
commit 686760799b
2 changed files with 9 additions and 18 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,16 +1,9 @@
#!/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 &
# Set default values
export REDMINE_USERNAME=${REDMINE_USERNAME:-"user"}
@ -21,11 +14,9 @@ export MARIADB_USER=${MARIADB_USER:-"root"}
export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
export MARIADB_PORT=${MARIADB_PORT:-"3306"}
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
for module in redmine; do
initialize $module
done
echo "Starting application ..."
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
nami_initialize redmine
info "Starting redmine..."
fi
exec /entrypoint.sh "$@"
exec tini -- "$@"