From eb2587771c0d5babf6885998848d099b9000bd2e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 13 Feb 2017 17:48:03 +0530 Subject: [PATCH] entrypoint: remove references to `entrypoint.sh` from base image --- bitnami/jenkins/rootfs/app-entrypoint.sh | 29 ++++++++---------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/bitnami/jenkins/rootfs/app-entrypoint.sh b/bitnami/jenkins/rootfs/app-entrypoint.sh index f6f699ecdd92..553f3dc4f18b 100755 --- a/bitnami/jenkins/rootfs/app-entrypoint.sh +++ b/bitnami/jenkins/rootfs/app-entrypoint.sh @@ -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 - initialize jenkins - echo "Starting application ..." +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then + nami_initialize jenkins + info "Starting jenkins..." fi -exec /entrypoint.sh "$@" +exec tini -- "$@"