public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

`harpoon` has been renamed to `nami`

This commit is contained in:
Sameer Naik 2016-09-04 21:07:08 +05:30
parent 40c6a6e769
commit a5261d56ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/jenkins/Dockerfile
View File

@ -1,4 +1,4 @@
FROM gcr.io/stacksmith-images/ubuntu:14.04-r8
FROM gcr.io/stacksmith-images/ubuntu:14.04-r9
MAINTAINER Bitnami <containers@bitnami.com>
@ -21,4 +21,4 @@ EXPOSE 8080 8443 50000
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["harpoon", "start", "--foreground", "tomcat"]
CMD ["nami", "start", "--foreground", "tomcat"]

6
bitnami/jenkins/rootfs/app-entrypoint.sh
View File

@ -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