Skip to content

Commit

Permalink
Fix issue with docker-rootless shimming script (#18690)
Browse files Browse the repository at this point in the history
  • Loading branch information
zeripath authored Feb 10, 2022
1 parent bc8e19e commit 7489d96
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions contrib/fhs-compliant-script/gitea
Original file line number Diff line number Diff line change
Expand Up @@ -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[@]}" "$@"
6 changes: 2 additions & 4 deletions docker/rootless/usr/local/bin/gitea
Original file line number Diff line number Diff line change
Expand Up @@ -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[@]}" "$@"

0 comments on commit 7489d96

Please sign in to comment.