From 6ea5ae4b2240343eb5869faabeeccad511c5afa0 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Mar 2017 12:14:40 +0530
Subject: [PATCH] removes `nami start` from Dockerfile CMD

---
 bitnami/php-fpm/5.6/Dockerfile               |  2 +-
 bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh |  3 +--
 bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh    | 10 ++++++++++
 bitnami/php-fpm/7.0/Dockerfile               |  2 +-
 bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh |  3 +--
 bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh    | 10 ++++++++++
 bitnami/php-fpm/7.1/Dockerfile               |  2 +-
 bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh |  3 +--
 bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh    | 10 ++++++++++
 9 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100755 bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh
 create mode 100755 bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh
 create mode 100755 bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh

diff --git a/bitnami/php-fpm/5.6/Dockerfile b/bitnami/php-fpm/5.6/Dockerfile
index a11533926d84..19dae746bbf8 100644
--- a/bitnami/php-fpm/5.6/Dockerfile
+++ b/bitnami/php-fpm/5.6/Dockerfile
@@ -22,4 +22,4 @@ EXPOSE 9000
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["nami", "start", "--foreground", "php"]
+CMD ["/run-php-fpm.sh"]
diff --git a/bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh b/bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh
index 2e1f84bebc2e..397eb1544c50 100755
--- a/bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh
+++ b/bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh
@@ -9,10 +9,9 @@ if [ -f composer.json  ]; then
   composer install
 fi
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run-php-fpm.sh" ]]; then
   nami_initialize php
   chown -R :daemon /bitnami/php || true
-  info "Starting php-fpm..."
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh b/bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh
new file mode 100755
index 000000000000..ca7427d07639
--- /dev/null
+++ b/bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON=php-fpm
+EXEC=$(which $DAEMON)
+ARGS="-F"
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS}
diff --git a/bitnami/php-fpm/7.0/Dockerfile b/bitnami/php-fpm/7.0/Dockerfile
index 314fbe2957e6..86e3ac7ae1f0 100644
--- a/bitnami/php-fpm/7.0/Dockerfile
+++ b/bitnami/php-fpm/7.0/Dockerfile
@@ -22,4 +22,4 @@ EXPOSE 9000
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["nami", "start", "--foreground", "php"]
+CMD ["/run-php-fpm.sh"]
diff --git a/bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh b/bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh
index 2e1f84bebc2e..397eb1544c50 100755
--- a/bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh
+++ b/bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh
@@ -9,10 +9,9 @@ if [ -f composer.json  ]; then
   composer install
 fi
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run-php-fpm.sh" ]]; then
   nami_initialize php
   chown -R :daemon /bitnami/php || true
-  info "Starting php-fpm..."
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh b/bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh
new file mode 100755
index 000000000000..ca7427d07639
--- /dev/null
+++ b/bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON=php-fpm
+EXEC=$(which $DAEMON)
+ARGS="-F"
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS}
diff --git a/bitnami/php-fpm/7.1/Dockerfile b/bitnami/php-fpm/7.1/Dockerfile
index dccfaccd7563..6a8d23b57199 100644
--- a/bitnami/php-fpm/7.1/Dockerfile
+++ b/bitnami/php-fpm/7.1/Dockerfile
@@ -22,4 +22,4 @@ EXPOSE 9000
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["nami", "start", "--foreground", "php"]
+CMD ["/run-php-fpm.sh"]
diff --git a/bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh b/bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh
index 2e1f84bebc2e..397eb1544c50 100755
--- a/bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh
+++ b/bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh
@@ -9,10 +9,9 @@ if [ -f composer.json  ]; then
   composer install
 fi
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run-php-fpm.sh" ]]; then
   nami_initialize php
   chown -R :daemon /bitnami/php || true
-  info "Starting php-fpm..."
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh b/bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh
new file mode 100755
index 000000000000..ca7427d07639
--- /dev/null
+++ b/bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON=php-fpm
+EXEC=$(which $DAEMON)
+ARGS="-F"
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS}