samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-17 00:10:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up bwhc startup

Browse Source
This commit is contained in:
Tobias Kussel
2023-05-16 10:56:28 +00:00
parent 187945b27e
commit 4e7f023b8a
13 changed files with 54 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bbmri/modules/dnpm-compose-bwhc.yml
View File

@ -4,21 +4,20 @@ services:
dnpm-frontend:
depends_on: [ dnpm-backend ]
build:
context: ../../dnpm/origin
dockerfile: Frontend.Dockerfile
network: host
context: ../../minimal/modules
dockerfile: dnpm-frontend.Dockerfile
args:
NUXT_HOST: 0.0.0.0
NUXT_PORT: 3000
BACKEND_PROTOCOL: ${DNPM_BMHC_BACKEND_PROTOCOL}
BACKEND_HOSTNAME: ${DNPM_BWHC_BACKEND_HOSTNAME}
BACKEND_PROTOCOL: http
BACKEND_HOSTNAME: dnpm-backend
BACKEND_PORT: 9000
DNPM_BWHC_FRONTEND_ZIP: ${DNPM_BWHC_FRONTEND_ZIP}
HTTP_PROXY: ${http_proxy}
HTTPS_PROXY: ${https_proxy}
environment:
BACKEND_PROTOCOL: ${DNPM_BMHC_BACKEND_PROTOCOL}
BACKEND_HOSTNAME: ${DNPM_BWHC_BACKEND_HOSTNAME}
BACKEND_PROTOCOL: http
BACKEND_HOSTNAME: dnpm-backend
BACKEND_PORT: 9000
no_proxy: dnpm-backend
labels:
@ -29,13 +28,11 @@ services:
dnpm-backend:
build:
context: ../../dnpm/origin
dockerfile: Backend.Dockerfile
context: ../../minimal/modules
dockerfile: dnpm-backend.Dockerfile
args:
BWHC_BASE_DIR: /bwhc-backend
DNPM_BWHC_BACKEND_ZIP: ${DNPM_BWHC_BACKEND_ZIP}
ports:
- 9000:9000
environment:
APPLICATION_SECRET: ${DNPM_APPLICATION_SECRET}
ZPM_SITE: ${ZPM_SITE}
@ -43,7 +40,6 @@ services:
# PLAY_HTTP_PORT: 9000
# PLAY_HTTP_ADDRESS: 0.0.0.0
volumes:
- ../dnpm/origin/logback.xml:/bwhc-backend/logback.xml:ro
- /etc/bridgehead/dnpm/bwhcConnectorConfig.xml:/bwhc-backend/bwhcConnectorConfig.xml:ro
- /etc/bridgehead/dnpm/production.conf:/bwhc-backend/production.conf:ro
- bwhc_data:/bwhc-backend/data/

10
bbmri/modules/dnpm-setup.sh
View File

@ -15,5 +15,15 @@ if [ -n "${ENABLE_DNPM}" ]; then
if [ -n "${ENABLE_DNPM_BWHC}" ]; then
log INFO "DNPM setup detected (with Frontend/Backend) -- will start BWHC Frontend/Backend. This is highly experimental!"
OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose-bwhc.yml"
if [ -z "${DNPM_BWHC_FRONTEND_ZIP}" ]; then
fail_and_report 1 "Variable DNPM_BWHC_FRONTEND_ZIP is not set."
fi
if [ -z "${DNPM_BWHC_BACKEND_ZIP}" ]; then
fail_and_report 1 "Variable DNPM_BWHC_BACKEND_ZIP is not set."
fi
if [ -z "${ZPM_SITE}" ]; then
fail_and_report 1 "Variable ZPM_SITE is not set."
fi
fi
fi