Skip to content

Commit 6c59898

Browse files
fix(docker): source GitHub OAuth creds from GH_OAUTH_* (GITHUB_ prefix is reserved) (#1327)
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1 parent a5e6b04 commit 6c59898

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

docker/.env.example

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ HEPHAESTUS_AUTH_STATE_COOKIE_KEY=
3737

3838
# GitHub OAuth App (https://github.com/settings/developers).
3939
# Callback: https://<hostname>/api/login/oauth2/code/github
40-
GITHUB_OAUTH_CLIENT_ID=
41-
GITHUB_OAUTH_CLIENT_SECRET=
40+
# Named GH_OAUTH_* (not GITHUB_OAUTH_*) because GitHub Actions reserves the GITHUB_ prefix for
41+
# secret/variable names; compose maps these onto the GITHUB_OAUTH_* the server actually reads.
42+
GH_OAUTH_CLIENT_ID=
43+
GH_OAUTH_CLIENT_SECRET=
4244

4345
# GitLab OAuth application (gitlab.com or self-hosted; scope: read_user — OAuth2 flow, not OIDC).
4446
# Callback: https://<hostname>/api/login/oauth2/code/gitlab. Leave the client id blank to disable.

docker/compose.app.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ services:
117117
# <provider>:<subject>. Optional break-glass token enables POST /auth/bootstrap-admin.
118118
HEPHAESTUS_AUTH_BOOTSTRAP_ADMINS: ${HEPHAESTUS_AUTH_BOOTSTRAP_ADMINS:-}
119119
HEPHAESTUS_AUTH_BOOTSTRAP_TOKEN: ${HEPHAESTUS_AUTH_BOOTSTRAP_TOKEN:-}
120-
GITHUB_OAUTH_CLIENT_ID: ${GITHUB_OAUTH_CLIENT_ID}
121-
GITHUB_OAUTH_CLIENT_SECRET: ${GITHUB_OAUTH_CLIENT_SECRET}
120+
# Sourced from GH_OAUTH_* — GitHub Actions reserves the GITHUB_ prefix for secret/variable
121+
# names, so the deploy can't provide GITHUB_OAUTH_*; the container still presents it to Spring.
122+
GITHUB_OAUTH_CLIENT_ID: ${GH_OAUTH_CLIENT_ID:-}
123+
GITHUB_OAUTH_CLIENT_SECRET: ${GH_OAUTH_CLIENT_SECRET:-}
122124
GITLAB_OAUTH_CLIENT_ID: ${GITLAB_OAUTH_CLIENT_ID:-}
123125
GITLAB_OAUTH_CLIENT_SECRET: ${GITLAB_OAUTH_CLIENT_SECRET:-}
124126
GITLAB_OAUTH_BASE_URL: ${GITLAB_OAUTH_BASE_URL:-https://gitlab.com}

docker/preview/compose.app.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ services:
208208
# Public URL for issuer validation (must match token's iss claim).
209209
HEPHAESTUS_AUTH_ISSUER: https://${PREVIEW_DOMAIN:?Required}
210210
HEPHAESTUS_AUTH_STATE_COOKIE_KEY: ${HEPHAESTUS_AUTH_STATE_COOKIE_KEY:?Required}
211-
GITHUB_OAUTH_CLIENT_ID: ${GITHUB_OAUTH_CLIENT_ID}
212-
GITHUB_OAUTH_CLIENT_SECRET: ${GITHUB_OAUTH_CLIENT_SECRET}
211+
# Sourced from GH_OAUTH_* — GitHub Actions reserves the GITHUB_ prefix for secret/variable names.
212+
GITHUB_OAUTH_CLIENT_ID: ${GH_OAUTH_CLIENT_ID:-}
213+
GITHUB_OAUTH_CLIENT_SECRET: ${GH_OAUTH_CLIENT_SECRET:-}
213214
GITLAB_OAUTH_CLIENT_ID: ${GITLAB_OAUTH_CLIENT_ID:-}
214215
GITLAB_OAUTH_CLIENT_SECRET: ${GITLAB_OAUTH_CLIENT_SECRET:-}
215216
GITLAB_OAUTH_BASE_URL: ${GITLAB_OAUTH_BASE_URL:-https://gitlab.com}

0 commit comments

Comments
 (0)