diff --git a/bitnami/jenkins/Dockerfile b/bitnami/jenkins/Dockerfile index 29085a9ba2f0..d1187e676d96 100644 --- a/bitnami/jenkins/Dockerfile +++ b/bitnami/jenkins/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/ubuntu:14.04-r8 +FROM gcr.io/stacksmith-images/ubuntu:14.04-r9 MAINTAINER Bitnami @@ -21,4 +21,4 @@ EXPOSE 8080 8443 50000 ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["harpoon", "start", "--foreground", "tomcat"] +CMD ["nami", "start", "--foreground", "tomcat"] diff --git a/bitnami/jenkins/rootfs/app-entrypoint.sh b/bitnami/jenkins/rootfs/app-entrypoint.sh index 3d93eebd85e9..81730a8a0d62 100755 --- a/bitnami/jenkins/rootfs/app-entrypoint.sh +++ b/bitnami/jenkins/rootfs/app-entrypoint.sh @@ -3,14 +3,14 @@ set -e function initialize { # Package can be "installed" or "unpacked" - status=`harpoon inspect $1` + 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 - harpoon initialize $1 $inputs + nami initialize $1 $inputs fi } @@ -20,7 +20,7 @@ export JENKINS_PASSWORD=${JENKINS_PASSWORD:-"bitnami"} -if [[ "$1" == "harpoon" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then initialize jenkins echo "Starting application ..." fi