harpoon has been renamed to nami

This commit is contained in:
Sameer Naik
2016-09-04 22:24:42 +05:30
parent 9c79180cea
commit 572f827041
2 changed files with 6 additions and 6 deletions

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> MAINTAINER Bitnami <containers@bitnami.com>
@@ -24,4 +24,4 @@ EXPOSE 80 443
ENTRYPOINT ["/app-entrypoint.sh"] ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["harpoon", "start", "--foreground", "apache"] CMD ["nami", "start", "--foreground", "apache"]

View File

@@ -3,12 +3,12 @@ set -e
function initialize { function initialize {
# Package can be "installed" or "unpacked" # Package can be "installed" or "unpacked"
status=`harpoon inspect $1` status=`nami inspect $1`
if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
if [[ -f /$1-inputs.json ]]; then if [[ -f /$1-inputs.json ]]; then
inputs=--inputs-file=/$1-inputs.json inputs=--inputs-file=/$1-inputs.json
fi fi
harpoon initialize $1 $inputs nami initialize $1 $inputs
fi fi
} }
@@ -24,8 +24,8 @@ export MARIADB_PORT=${MARIADB_PORT:-"3306"}
if [[ "$1" == "harpoon" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
for module in php apache owncloud; do for module in apache owncloud; do
initialize $module initialize $module
done done
echo "Starting application ..." echo "Starting application ..."