mirror of
https://github.com/samply/bridgehead.git
synced 2026-11-01 19:30:37 +01:00
fix(dnpm): update authup config for current authup releases (#407)
- Switch system auth from robot to client: authup no longer reads ROBOT_ADMIN_* (since 1.0.0-beta.54) and the backend no longer accepts robot:// in AUTHUP_URL, so use CLIENT_SYSTEM_* and client://. - command: server/core start -> start: the server/core prefix is deprecated. - Drop the /usr/src/app/writable volume: the path no longer exists in the image and nothing durable is stored there with mysql. - Replace AUTHORIZE_REDIRECT_URL with TRUSTED_ORIGINS: the old key was removed upstream; TRUSTED_ORIGINS controls the allowed redirect origins. - Set NUXT_PUBLIC_ACCOUNT_URL on the portal: authup now serves the account console under /auth/console/account, the portal's default link 404s. Mirrors dnpm-dip/deployment#15 and 56cc618.
This commit is contained in:
@@ -17,18 +17,16 @@ services:
|
|||||||
dnpm-authup:
|
dnpm-authup:
|
||||||
image: authup/authup:latest
|
image: authup/authup:latest
|
||||||
container_name: bridgehead-dnpm-authup
|
container_name: bridgehead-dnpm-authup
|
||||||
volumes:
|
|
||||||
- /var/cache/bridgehead/dnpm/authup:/usr/src/app/writable
|
|
||||||
depends_on:
|
depends_on:
|
||||||
dnpm-mysql:
|
dnpm-mysql:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
command: server/core start
|
command: start
|
||||||
environment:
|
environment:
|
||||||
- PUBLIC_URL=https://${HOST}/auth/
|
- PUBLIC_URL=https://${HOST}/auth/
|
||||||
- AUTHORIZE_REDIRECT_URL=https://${HOST}
|
- TRUSTED_ORIGINS=https://${HOST}
|
||||||
- ROBOT_ADMIN_ENABLED=true
|
- CLIENT_SYSTEM_ENABLED=true
|
||||||
- ROBOT_ADMIN_SECRET=${DNPM_AUTHUP_SECRET}
|
- CLIENT_SYSTEM_SECRET=${DNPM_AUTHUP_SECRET}
|
||||||
- ROBOT_ADMIN_SECRET_RESET=true
|
- CLIENT_SYSTEM_SECRET_RESET=true
|
||||||
- DB_TYPE=mysql
|
- DB_TYPE=mysql
|
||||||
- DB_HOST=dnpm-mysql
|
- DB_HOST=dnpm-mysql
|
||||||
- DB_USERNAME=root
|
- DB_USERNAME=root
|
||||||
@@ -50,6 +48,7 @@ services:
|
|||||||
- NUXT_PUBLIC_API_URL=https://${HOST}/api/
|
- NUXT_PUBLIC_API_URL=https://${HOST}/api/
|
||||||
- NUXT_AUTHUP_URL=http://dnpm-authup:3000/
|
- NUXT_AUTHUP_URL=http://dnpm-authup:3000/
|
||||||
- NUXT_PUBLIC_AUTHUP_URL=https://${HOST}/auth/
|
- NUXT_PUBLIC_AUTHUP_URL=https://${HOST}/auth/
|
||||||
|
- NUXT_PUBLIC_ACCOUNT_URL=https://${HOST}/auth/console/account
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.dnpm-frontend.rule=PathPrefix(`/`)"
|
- "traefik.http.routers.dnpm-frontend.rule=PathPrefix(`/`)"
|
||||||
@@ -65,7 +64,7 @@ services:
|
|||||||
- MTB_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}
|
- MTB_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}
|
||||||
- HATEOAS_HOST=https://${HOST}
|
- HATEOAS_HOST=https://${HOST}
|
||||||
- CONNECTOR_TYPE=broker
|
- CONNECTOR_TYPE=broker
|
||||||
- AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
|
- AUTHUP_URL=client://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
|
||||||
- TZ=Europe/Berlin
|
- TZ=Europe/Berlin
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/bridgehead/dnpm/config:/dnpm_config
|
- /etc/bridgehead/dnpm/config:/dnpm_config
|
||||||
|
|||||||
@@ -17,18 +17,16 @@ services:
|
|||||||
dnpm-authup:
|
dnpm-authup:
|
||||||
image: authup/authup:latest
|
image: authup/authup:latest
|
||||||
container_name: bridgehead-dnpm-authup
|
container_name: bridgehead-dnpm-authup
|
||||||
volumes:
|
|
||||||
- /var/cache/bridgehead/dnpm/authup:/usr/src/app/writable
|
|
||||||
depends_on:
|
depends_on:
|
||||||
dnpm-mysql:
|
dnpm-mysql:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
command: server/core start
|
command: start
|
||||||
environment:
|
environment:
|
||||||
- PUBLIC_URL=https://${HOST}/auth/
|
- PUBLIC_URL=https://${HOST}/auth/
|
||||||
- AUTHORIZE_REDIRECT_URL=https://${HOST}
|
- TRUSTED_ORIGINS=https://${HOST}
|
||||||
- ROBOT_ADMIN_ENABLED=true
|
- CLIENT_SYSTEM_ENABLED=true
|
||||||
- ROBOT_ADMIN_SECRET=${DNPM_AUTHUP_SECRET}
|
- CLIENT_SYSTEM_SECRET=${DNPM_AUTHUP_SECRET}
|
||||||
- ROBOT_ADMIN_SECRET_RESET=true
|
- CLIENT_SYSTEM_SECRET_RESET=true
|
||||||
- DB_TYPE=mysql
|
- DB_TYPE=mysql
|
||||||
- DB_HOST=dnpm-mysql
|
- DB_HOST=dnpm-mysql
|
||||||
- DB_USERNAME=root
|
- DB_USERNAME=root
|
||||||
@@ -50,6 +48,7 @@ services:
|
|||||||
- NUXT_PUBLIC_API_URL=https://${HOST}/api/
|
- NUXT_PUBLIC_API_URL=https://${HOST}/api/
|
||||||
- NUXT_AUTHUP_URL=http://dnpm-authup:3000/
|
- NUXT_AUTHUP_URL=http://dnpm-authup:3000/
|
||||||
- NUXT_PUBLIC_AUTHUP_URL=https://${HOST}/auth/
|
- NUXT_PUBLIC_AUTHUP_URL=https://${HOST}/auth/
|
||||||
|
- NUXT_PUBLIC_ACCOUNT_URL=https://${HOST}/auth/console/account
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.dnpm-frontend.rule=PathPrefix(`/`)"
|
- "traefik.http.routers.dnpm-frontend.rule=PathPrefix(`/`)"
|
||||||
@@ -65,7 +64,7 @@ services:
|
|||||||
- MTB_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}
|
- MTB_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}
|
||||||
- HATEOAS_HOST=https://${HOST}
|
- HATEOAS_HOST=https://${HOST}
|
||||||
- CONNECTOR_TYPE=broker
|
- CONNECTOR_TYPE=broker
|
||||||
- AUTHUP_URL=robot://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
|
- AUTHUP_URL=client://system:${DNPM_AUTHUP_SECRET}@http://dnpm-authup:3000
|
||||||
- TZ=Europe/Berlin
|
- TZ=Europe/Berlin
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/bridgehead/dnpm/config:/dnpm_config
|
- /etc/bridgehead/dnpm/config:/dnpm_config
|
||||||
|
|||||||
Reference in New Issue
Block a user