diff --git a/bitnami/joomla/Dockerfile b/bitnami/joomla/Dockerfile index c875eb169e7e..78bd6577f09a 100644 --- a/bitnami/joomla/Dockerfile +++ b/bitnami/joomla/Dockerfile @@ -7,7 +7,7 @@ ENV BITNAMI_APP_NAME=joomla \ PATH=/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH # Additional modules required -RUN bitnami-pkg unpack apache-2.4.23-1 --checksum c8d14a79313c5e47dbf617e9a55e88ff91d8361357386bab520aabccd35c59d8 +RUN bitnami-pkg unpack apache-2.4.23-2 --checksum be3c28581f363e240f04c2d32bcf2d4a5ea0926722bb23ab9f5dfb38bde22bac RUN bitnami-pkg unpack php-5.6.25-0 --checksum f0e8d07d155abdb5d6843931d3ffbf9b4208fff248c409444fdd5a8e3a3da01d RUN bitnami-pkg install libphp-5.6.21-2 --checksum 83d19b750b627fa70ed9613504089732897a48e1a7d304d8d73dec61a727b222 RUN bitnami-pkg install mysql-client-10.1.13-4 --checksum 14b45c91dd78b37f0f2366712cbe9bfdf2cb674769435611955191a65dbf4976 @@ -23,4 +23,4 @@ EXPOSE 80 443 ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["harpoon", "start", "--foreground", "apache"] +CMD ["nami", "start", "--foreground", "apache"] diff --git a/bitnami/joomla/rootfs/app-entrypoint.sh b/bitnami/joomla/rootfs/app-entrypoint.sh index 7034a17093ef..33e722c51b9a 100755 --- a/bitnami/joomla/rootfs/app-entrypoint.sh +++ b/bitnami/joomla/rootfs/app-entrypoint.sh @@ -3,12 +3,13 @@ set -e function initialize { # Package can be "installed" or "unpacked" - status=`harpoon inspect $1` + status=`nami inspect $1` if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then + inputs="" if [[ -f /$1-inputs.json ]]; then inputs=--inputs-file=/$1-inputs.json fi - harpoon initialize $1 $inputs + nami initialize $1 $inputs fi } @@ -24,8 +25,8 @@ 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 - for module in php apache joomla; do +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then + for module in apache php joomla; do initialize $module done echo "Starting application ..."