docker: Promote compose port align to master #13

Merged

Ghost merged 5 commits from bot/promote-compose-port-align into master 2026-09-02 11:39:36 -05:00

Conversation 0 Commits 5 Files Changed 2

+19 -11

Ghost commented 2026-09-02 11:37:23 -05:00

Copy Link

Copy Source

Promote compose/README port align from develop (PR #11 / tip a6e069340902) onto master.

Direct develop→master PR #12 was unmergeable (README diverged: master has ADMIN_PASSWORD boot-rule docs; develop has compose ADMIN_PORT=81 align). This PR uses temporary branch bot/promote-compose-port-align:

• merges develop onto current master
• resolves README keeping master password/boot rules + develop compose port-81 align (admin unpublished by default)
• lands docker-compose.yml ADMIN_PORT=81 + healthcheck on :81

After squash-merge: delete bot/promote-compose-port-align only — do not delete develop.

Promote compose/README port align from `develop` (PR #11 / tip `a6e069340902`) onto `master`. Direct `develop`→`master` PR #12 was unmergeable (README diverged: master has ADMIN_PASSWORD boot-rule docs; develop has compose ADMIN_PORT=81 align). This PR uses temporary branch `bot/promote-compose-port-align`: - merges develop onto current master - resolves README keeping master password/boot rules + develop compose port-81 align (admin unpublished by default) - lands `docker-compose.yml` `ADMIN_PORT=81` + healthcheck on `:81` After squash-merge: **delete** `bot/promote-compose-port-align` only — do **not** delete `develop`.

Ghost added 5 commits 2026-09-02 11:37:23 -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.

Ghost merged commit ac295ec330 into master 2026-09-02 11:39:36 -05:00

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#13