diff options
| author | zeripath <art27@cantab.net> | 2022-02-10 06:15:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 01:15:06 -0500 |
| commit | 7489d96db6daa8e12abf97424b6fcc0b65f5a4bd (patch) | |
| tree | cf60486a53e79b8e89daa6ab37c135a8422cbdc5 | |
| parent | bc8e19ece1663d67f980c56612eb2423ae33eee6 (diff) | |
| download | gitea-7489d96db6daa8e12abf97424b6fcc0b65f5a4bd.tar.gz gitea-7489d96db6daa8e12abf97424b6fcc0b65f5a4bd.zip | |
Fix issue with docker-rootless shimming script (#18690)
| -rwxr-xr-x | contrib/fhs-compliant-script/gitea | 6 | ||||
| -rw-r--r-- | docker/rootless/usr/local/bin/gitea | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/contrib/fhs-compliant-script/gitea b/contrib/fhs-compliant-script/gitea index ae1ae3cf14..ea033b0f2d 100755 --- a/contrib/fhs-compliant-script/gitea +++ b/contrib/fhs-compliant-script/gitea @@ -33,10 +33,8 @@ for i in "$@"; do done if [ -z "$APP_INI_SET" ]; then - CONF_ARG="-c \"$APP_INI\"" + CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}") fi # Provide FHS compliant defaults -GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@" - - +GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}" "$@" diff --git a/docker/rootless/usr/local/bin/gitea b/docker/rootless/usr/local/bin/gitea index 1b33ca8547..9a9a569b12 100644 --- a/docker/rootless/usr/local/bin/gitea +++ b/docker/rootless/usr/local/bin/gitea @@ -32,11 +32,9 @@ for i in "$@"; do done if [ -z "$APP_INI_SET" ]; then - CONF_ARG="-c \"${GITEA_APP_INI:-$APP_INI}\"" + CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}") fi # Provide docker defaults -GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@" - - +GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}" "$@" |