Merge branch 'launch-command'

bitnami/nginx/1/Dockerfile

@@ -25,4 +25,4 @@ EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["nami", "start", "--foreground", "nginx"]
+CMD ["/run.sh"]

bitnami/nginx/1/rootfs/app-entrypoint.sh

@@ -5,10 +5,9 @@
 print_welcome_page
 check_for_updates &
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
   nami_initialize nginx
   chown -R :daemon /bitnami/nginx || true
-  info "Starting nginx..."
 fi
 
 exec tini -- "$@"

bitnami/nginx/1/rootfs/run.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON=nginx
+EXEC=$(which $DAEMON)
+ARGS=
+
+# redirect nginx logs to stdout/stderr
+ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log
+ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS} -g 'daemon off;'