Bladeren bron

Fix issue with docker-rootless shimming script (#18690) (#18699)

Backport #18690

There is a problem with the current shimming script in that it will double quote the
provided GITEA_APP_INI due to a mistake in the bash. Here we change this to use a bash array.

Fix https://gitea.com/gitea/helm-chart/issues/287

Signed-off-by: Andrew Thornton <art27@cantab.net>
tags/v1.16.2
zeripath 2 jaren geleden
bovenliggende
commit
ce69882180
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 4 en 8 verwijderingen
  1. 2
    4
      contrib/fhs-compliant-script/gitea
  2. 2
    4
      docker/rootless/usr/local/bin/gitea

+ 2
- 4
contrib/fhs-compliant-script/gitea Bestand weergeven

@@ -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[@]}" "$@"

+ 2
- 4
docker/rootless/usr/local/bin/gitea Bestand weergeven

@@ -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[@]}" "$@"

Laden…
Annuleren
Opslaan