From 0ce21d49ebabcd80f39ade20ebbed5b98cb92730 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 30 Sep 2015 20:26:13 +0530 Subject: [PATCH] allow users to pass arguments to `nginx` --- bitnami/nginx/rootfs/entrypoint.sh | 6 +++++- bitnami/nginx/rootfs/etc/services.d/nginx/run | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/nginx/rootfs/entrypoint.sh b/bitnami/nginx/rootfs/entrypoint.sh index e85891bcbb3e..a250c29b460a 100755 --- a/bitnami/nginx/rootfs/entrypoint.sh +++ b/bitnami/nginx/rootfs/entrypoint.sh @@ -1,6 +1,10 @@ #!/bin/bash -if [ "${1}" == "nginx" -o "${1}" == "$(which nginx)" ]; then +if [ "${1:0:1}" = '-' ]; then + export EXTRA_OPTIONS="$@" + set -- +elif [ "${1}" == "nginx" -o "${1}" == "$(which nginx)" ]; then + export EXTRA_OPTIONS="${@:2}" set -- fi diff --git a/bitnami/nginx/rootfs/etc/services.d/nginx/run b/bitnami/nginx/rootfs/etc/services.d/nginx/run index 5838851596e0..46c02e8a9808 100755 --- a/bitnami/nginx/rootfs/etc/services.d/nginx/run +++ b/bitnami/nginx/rootfs/etc/services.d/nginx/run @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bash set -e source $BITNAMI_PREFIX/bitnami-utils.sh -exec nginx -g "daemon off;" +exec nginx -g "daemon off;" ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}