astra/owpengram-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

admin: fix env editor crash and ship .env.example into the image
Some checks failed
CI / Go tests (push) Has been cancelled
Details
CI / Admin web build (push) Has been cancelled
Details
CI / Grammy store bot (push) Has been cancelled
Details
CI / Docker main topology smoke (push) Has been cancelled
Details

Browse source 
ReadEnvGroups returned (nil, nil) when .env.example wasn't found, and that
nil slice marshaled to JSON null instead of []. The admin UI's env editor
unconditionally calls .reduce()/.map() on the response, so it crashed on
load with "Cannot read properties of null" -- and .env.example was never
copied into the container image in the first place, so this was always the
production code path, not an edge case.

Fixed the nil-slice response and added .env.example to the image so the
editor actually has a template of available settings to show. The real
current values still require the deploy host to mount its actual .env file
into the owpengram-admin container at /app/.env (procctl.Manager.Root is
just os.Getwd(), i.e. the container's /app workdir) -- that's a systemd
Quadlet unit change on the deploy host, not something this commit can fix on
its own.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Astra 2026-09-14 17:02:02 +01:00
parent ec91375e99
commit 4cbd4c0c9e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containerfile
View file

@ -28,5 +28,9 @@ COPY --from=build /out/telesrv-admin /app/telesrv-admin
COPY --from=build /out/createuser /app/createuser COPY --from=build /out/createuser /app/createuser
COPY --from=build /src/data/langpack /app/data/langpack COPY --from=build /src/data/langpack /app/data/langpack
COPY --from=build /src/data/sticker-seed /app/data/sticker-seed COPY --from=build /src/data/sticker-seed /app/data/sticker-seed
# telesrv-admin's Server Settings env editor (procctl.Manager.ReadEnvGroups)
# reads this as the template of available settings; without it the editor
# always reports zero groups.
COPY --from=build /src/.env.example /app/.env.example
EXPOSE 2398 2600 EXPOSE 2398 2600
ENTRYPOINT ["/app/gramsrv"] ENTRYPOINT ["/app/gramsrv"]

7
internal/procctl/procctl.go
View file

@ -525,7 +525,12 @@ func (m *Manager) ReadEnvGroups() ([]EnvGroup, error) {
tmplPath := filepath.Join(m.Root, ".env.example") tmplPath := filepath.Join(m.Root, ".env.example")
tmplData, err := os.ReadFile(tmplPath) tmplData, err := os.ReadFile(tmplPath)
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil // A nil slice here would marshal to JSON null instead of [] -- the
// admin UI's env editor unconditionally calls .reduce()/.map() on
// this response and crashes on null. .env.example isn't shipped
// inside the container image, so this path is the normal case in
// production, not an edge case.
return []EnvGroup{}, nil
} }
if err != nil { if err != nil {
return nil, fmt.Errorf("read .env.example: %w", err) return nil, fmt.Errorf("read .env.example: %w", err)