Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-08 10:47:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

harpoon has been renamed to nami

Browse Source
This commit is contained in:
Sameer Naik
2016-09-04 22:48:18 +05:30
parent 97bea096e6
commit 27c15a5dd7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

6
bitnami/phpbb/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
}
@@ -24,7 +24,7 @@ export MARIADB_USER=${MARIADB_USER:-"root"}
export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
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 apache php phpbb; do
initialize $module
done