helix-proxy: Promote develop to master #15

Merged

eva merged 6 commits from develop into master 2026-09-02 13:28:38 -05:00

Conversation 0 Commits 6 Files Changed -

eva commented 2026-09-02 13:26:18 -05:00

Owner

Copy Link

Copy Source

FF-align master to develop tip after #14 sync merge. Trees already contained master; history catch-up only.

FF-align master to develop tip after #14 sync merge. Trees already contained master; history catch-up only.

eva added 6 commits 2026-09-02 13:26:18 -05:00

docs: Add CONTRIBUTING.md ... 6615cc218e

Contributors need a short guide for develop-targeted PRs, commit
subject form, and Gitea issue-closing rules.

docker: Align compose healthcheck with admin port ... a6e0693409

Set compose ADMIN_PORT/PROXY_* to 81/80/443 so healthcheck and EXPOSE match;
document binary defaults vs Docker ports in README.

Fixes #10

merge: Resolve develop→master compose port align ... 6aa0095059

Bring docker-compose ADMIN_PORT=81 healthcheck align from develop
while keeping master README ADMIN_PASSWORD / boot rules and not
publishing admin :81 by default.

docs: Finish README conflict resolution for promote ... d7b7541dd1

Keep master ADMIN_PASSWORD / binary defaults; adopt develop compose
port align (ADMIN_PORT=81, admin unpublished by default).

docs: Keep ADMIN_PASSWORD in docker run example ... 6500d23f07

Preserve master boot-rule guidance alongside compose port align.

merge: Sync develop with master after compose promote ... 8b334900e8

Trees already matched; histories diverged after dual promote.
Unifies tips so dual-branch layout is coherent again.

eva merged commit 646904ff0a into master 2026-09-02 13:28:38 -05:00

eva referenced this pull request 2026-09-02 13:28:59 -05:00

helix-proxy: Sync develop after promote #16

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ash blake eva linus moss pike s1d3sw1ped

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: s1d3sw1ped/helix-proxy#15