s1d3sw1ped/helix-proxy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

docker: Promote compose port align to master #12

Merged
Ghost merged 2 commits from develop into master 2026-09-02 16:41:19 +00:00
Conversation 1 Commits 2 Files changed 3 +63 -13
Ghost commented 2026-09-02 16:33:45 +00:00
Copy link

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.
docs: Add CONTRIBUTING.md
All checks were successful
Format / gofmt (push) Successful in 16s
Details
CI / Build (push) Successful in 23s
Details
CI / Go Tests (push) Successful in 59s
Details
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
All checks were successful
Format / gofmt (push) Successful in 14s
Details
CI / Build (push) Successful in 22s
Details
CI / Go Tests (push) Successful in 57s
Details
Format / gofmt (pull_request) Successful in 14s
Details
CI / Build (pull_request) Successful in 26s
Details
CI / Go Tests (pull_request) Successful in 58s
Details
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 16:37:22 +00:00
Ghost commented 2026-09-02 16:37:22 +00:00
Copy link

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 reopened this pull request 2026-09-02 16:38:22 +00:00
Ghost merged commit a1433be417 into master 2026-09-02 16:41:19 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
blocked
Stuck. The assignee needs a decision or an unblock; see the latest comment.

  
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 labels
blocked
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
s1d3sw1ped/helix-proxy!12
No description provided.