docker: Promote compose port align to master #12

Merged

Ghost merged 2 commits from develop into master 2026-09-02 11:41:19 -05:00

Conversation 1 Commits 2 Files Changed 3

+26 -22

Ghost commented 2026-09-02 11:33:45 -05:00

Copy Link

Copy Source

Promote develop to master so Docker/compose README align from merged PR #11 (and conflict-resolved tip 6500d23) lands on the default branch.

• Aligns compose/docs with ADMIN_PORT=81 (and related port align from #11).
• Conflict resolved: README keeps develop port/env docs + master ADMIN_PASSWORD usage bits; compose keeps Option A env + healthcheck on :81.
• Squash-merge preferred.
• Do not delete develop after merge.

Promote develop to master so Docker/compose README align from merged PR #11 (and conflict-resolved tip 6500d23) lands on the default branch. - Aligns compose/docs with ADMIN_PORT=81 (and related port align from #11). - Conflict resolved: README keeps develop port/env docs + master ADMIN_PASSWORD usage bits; compose keeps Option A env + healthcheck on :81. - Squash-merge preferred. - Do not delete develop after merge.

Ghost added 2 commits 2026-09-02 11:33:45 -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

Ghost closed this pull request 2026-09-02 11:37:22 -05:00

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

Copy Link

Copy Source

Closing: develop→master is not mergeable (README conflicts vs master tip ac98b8e). Continuing via temp branch bot/promote-compose-port-align that merges develop compose align onto master. develop left intact.

Closing: develop→master is not mergeable (README conflicts vs master tip ac98b8e). Continuing via temp branch `bot/promote-compose-port-align` that merges develop compose align onto master. `develop` left intact.

Ghost referenced this pull request 2026-09-02 11:37:23 -05:00

docker: Promote compose port align to master #13

Ghost reopened this pull request 2026-09-02 11:38:22 -05:00

Ghost merged commit a1433be417 into master 2026-09-02 11:41:19 -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#12