mirror of
https://github.com/casjaysdevdocker/gitea
synced 2026-08-14 14:01:17 -04:00
🐛 Fix __format_variables returning a single space for empty input 🐛
App-breaking bug found during full runtime verification of the act_runner cache-server feature: gitea failed to start with `Command error: unknown command: /config/gitea/app.ini` because its `--port` argument was empty. Root cause: `__format_variables()` ran `printf '%s\n' $input | sort -Ru | tr '\n' ' '` unconditionally. When `$input` word-splits to zero words (whitespace-only, e.g. no port env vars set), `printf` with a `%s` format still runs once with a missing arg, emitting a blank line — so the function returned a single space `" "` instead of empty. That made `ENV_PORTS` / `WEB_SERVER_PORTS` resolve to `" "`, which made `SERVICE_PORT` in `08-gitea.sh` become `" "` — non-empty per `[ -n ... ]` but rendering as an empty `--port` value to `gitea web`. - rootfs/usr/local/etc/docker/functions/entrypoint.sh: replaced `[ -z "$input" ] && return 0` with `[[ "$input" =~ [^[:space:]] ]] || return 0` so whitespace-only input is treated as empty before reaching the `printf` pipeline - TODO.AI.md: logged the fix and the upstream-template-sync follow-up Verified: rebuilt the image and confirmed `gitea will be running on port 80` / `gitea web --port 80 ...` in a full container run (previously `--port` with no value).
This commit is contained in:
+13
@@ -29,6 +29,19 @@ Update Runbook in AI.md — `functions/entrypoint.sh` is normally regenerated, n
|
|||||||
- `__random_password()` (~line 333): `tr | head -c` pipeline died under `set -eo pipefail` on
|
- `__random_password()` (~line 333): `tr | head -c` pipeline died under `set -eo pipefail` on
|
||||||
SIGPIPE. Fixed by wrapping in `{ ... } || true`.
|
SIGPIPE. Fixed by wrapping in `{ ... } || true`.
|
||||||
|
|
||||||
|
## App-breaking bug fixed — __format_variables() whitespace-only input (functions/entrypoint.sh)
|
||||||
|
|
||||||
|
Needs syncing back to the upstream template per AI.md's runbook.
|
||||||
|
|
||||||
|
- `__format_variables()` (~line 187): `printf '%s\n' $input | sort -Ru | tr '\n' ' '` always
|
||||||
|
emits at least one line even when `$input` word-splits to zero words (whitespace-only), because
|
||||||
|
`printf` with a format containing `%s` runs once even with no args. This made `ENV_PORTS` /
|
||||||
|
`WEB_SERVER_PORTS` resolve to a single space `" "` instead of empty when no port env vars were
|
||||||
|
set, which made `SERVICE_PORT` in `08-gitea.sh` become `" "` — passing the `-n` test but
|
||||||
|
rendering as an empty `--port` arg to `gitea web`, which broke gitea's CLI argument parsing
|
||||||
|
entirely (`Command error: unknown command: /config/gitea/app.ini`). Fixed by replacing the
|
||||||
|
`[ -z "$input" ]` check with `[[ "$input" =~ [^[:space:]] ]] || return 0`.
|
||||||
|
|
||||||
## Other observations not yet actioned
|
## Other observations not yet actioned
|
||||||
|
|
||||||
- `.gitea/workflows/docker.yaml` uses the same stale/unpinned action pattern (`@v2`-`@v4`, DockerHub-only, `catthehacker/ubuntu:act-latest`) that was removed from the `opengist` repo's duplicate workflow — no `build.yml` counterpart exists here yet.
|
- `.gitea/workflows/docker.yaml` uses the same stale/unpinned action pattern (`@v2`-`@v4`, DockerHub-only, `catthehacker/ubuntu:act-latest`) that was removed from the `opengist` repo's duplicate workflow — no `build.yml` counterpart exists here yet.
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ __get_pid() {
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
__format_variables() {
|
__format_variables() {
|
||||||
local input="${*//,/ }"
|
local input="${*//,/ }"
|
||||||
[ -z "$input" ] && return 0
|
[[ "$input" =~ [^[:space:]] ]] || return 0
|
||||||
printf '%s\n' $input | sort -Ru | tr '\n' ' '
|
printf '%s\n' $input | sort -Ru | tr '\n' ' '
|
||||||
}
|
}
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|||||||
Reference in New Issue
Block a user