Skip to content

Commit 7489d96

Browse files
authored
Fix issue with docker-rootless shimming script (#18690)
1 parent bc8e19e commit 7489d96

File tree

2 files changed

+4
-8
lines changed
  • contrib/fhs-compliant-script
  • docker/rootless/usr/local/bin

2 files changed

+4
-8
lines changed

contrib/fhs-compliant-script/gitea

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ for i in "$@"; do
3333
done
3434

3535
if [ -z "$APP_INI_SET" ]; then
36-
CONF_ARG="-c \"$APP_INI\""
36+
CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}")
3737
fi
3838

3939
# Provide FHS compliant defaults
40-
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@"
41-
42-
40+
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}" "$@"

docker/rootless/usr/local/bin/gitea

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ for i in "$@"; do
3232
done
3333

3434
if [ -z "$APP_INI_SET" ]; then
35-
CONF_ARG="-c \"${GITEA_APP_INI:-$APP_INI}\""
35+
CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}")
3636
fi
3737

3838

3939
# Provide docker defaults
40-
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@"
41-
42-
40+
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}" "$@"

0 commit comments

Comments
 (0)