mirror of
https://github.com/bitnami/containers.git
synced 2026-03-15 06:48:04 +08:00
harpoon has been renamed to nami
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -32,8 +32,8 @@ export MARIADB_PORT=${MARIADB_PORT:-"3306"}
|
||||
ln -fs /opt/bitnami/magento/conf/cron /etc/cron.d/magento
|
||||
|
||||
|
||||
if [[ "$1" == "harpoon" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
for module in php apache magento; do
|
||||
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
|
||||
for module in apache php magento; do
|
||||
initialize $module
|
||||
done
|
||||
echo "Starting application ..."
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
/usr/sbin/cron
|
||||
harpoon start --foreground apache
|
||||
nami start --foreground apache
|
||||
|
||||
Reference in New Issue
Block a user