Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-24 07:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

removes nami start from Dockerfile CMD

Browse Source
This commit is contained in:
Sameer Naik
2017-03-13 12:14:40 +05:30
parent 63d62d828b
commit 6ea5ae4b22
9 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/php-fpm/5.6/Dockerfile
View File

@@ -22,4 +22,4 @@ EXPOSE 9000
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "php"]
CMD ["/run-php-fpm.sh"]

3
bitnami/php-fpm/5.6/rootfs/app-entrypoint.sh
View File

@@ -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 -- "$@"

10
bitnami/php-fpm/5.6/rootfs/run-php-fpm.sh Executable file
View File

@@ -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}

2
bitnami/php-fpm/7.0/Dockerfile
View File

@@ -22,4 +22,4 @@ EXPOSE 9000
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "php"]
CMD ["/run-php-fpm.sh"]

3
bitnami/php-fpm/7.0/rootfs/app-entrypoint.sh
View File

@@ -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 -- "$@"

10
bitnami/php-fpm/7.0/rootfs/run-php-fpm.sh Executable file
View File

@@ -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}

2
bitnami/php-fpm/7.1/Dockerfile
View File

@@ -22,4 +22,4 @@ EXPOSE 9000
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami", "start", "--foreground", "php"]
CMD ["/run-php-fpm.sh"]

3
bitnami/php-fpm/7.1/rootfs/app-entrypoint.sh
View File

@@ -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 -- "$@"

10
bitnami/php-fpm/7.1/rootfs/run-php-fpm.sh Executable file
View File

@@ -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}