mirror of
https://github.com/samply/bridgehead.git
synced 2025-06-17 06:00:14 +02:00
Fixed some merge issues
This commit is contained in:
@ -32,7 +32,7 @@ services:
|
||||
|
||||
### Does need to know the outside proxy to connect central components
|
||||
forward_proxy:
|
||||
container_name: bridgehead-squid
|
||||
container_name: bridgehead-forward-proxy
|
||||
image: ubuntu/squid
|
||||
environment:
|
||||
http_proxy: ${http_proxy}
|
||||
@ -65,11 +65,11 @@ services:
|
||||
- "blaze-data:/app/data"
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.middlewares.test-auth.basicauth.users=${bc_auth_users}"
|
||||
- "traefik.http.middlewares.cpp-auth.basicauth.users=${bc_auth_users}"
|
||||
- "traefik.http.routers.blaze_ccp.rule=PathPrefix(`/ccp-localdatamanagement`)"
|
||||
- "traefik.http.middlewares.ccp_b_strip.stripprefix.prefixes=/ccp-localdatamanagement"
|
||||
- "traefik.http.services.blaze_ccp.loadbalancer.server.port=8080"
|
||||
- "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,test-auth"
|
||||
- "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,cpp-auth"
|
||||
- "traefik.http.routers.blaze_ccp.tls=true"
|
||||
|
||||
ccp-search-share:
|
||||
@ -82,10 +82,10 @@ services:
|
||||
APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir"
|
||||
SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share"
|
||||
JAVA_TOOL_OPTIONS: "-Xmx1g"
|
||||
http_proxy: "http://bridgehead-squid:3128"
|
||||
https_proxy: "http://bridgehead-squid:3128"
|
||||
HTTP_PROXY: "http://bridgehead-squid:3128"
|
||||
HTTPS_PROXY: "http://bridgehead-squid:3128"
|
||||
http_proxy: "http://bridgehead-forward-proxy:3128"
|
||||
https_proxy: "http://bridgehead-forward-proxy:3128"
|
||||
HTTP_PROXY: "http://bridgehead-forward-proxy:3128"
|
||||
HTTPS_PROXY: "http://bridgehead-forward-proxy:3128"
|
||||
depends_on:
|
||||
- ccp-search-share-db
|
||||
- blaze
|
||||
|
Reference in New Issue
Block a user