samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2026-11-01 18:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from samply/develop

Browse Source 
Main <- Develop
This commit is contained in:
Tobias Kussel
2026-10-26 11:00:00 +01:00
committed by GitHub
parent f0dac5e8fc 563af88a76
commit 0ca43d6091
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ccp/modules/dnpm-node-compose.yml
+7 -8
View File
@@ -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
minimal/modules/dnpm-node-compose.yml
+7 -8
View File
@@ -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