mirror of
https://github.com/samply/bridgehead.git
synced 2025-12-09 09:04:27 +01:00
Compare commits
3 Commits
feature/ps
...
hotfix/sec
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aafc2afee7 | ||
|
|
dd3387c2f1 | ||
|
|
a5120ba75b |
@@ -11,6 +11,7 @@ services:
|
|||||||
BLAZE_URL: "http://blaze:8080/fhir/"
|
BLAZE_URL: "http://blaze:8080/fhir/"
|
||||||
BEAM_PROXY_URL: http://beam-proxy-eric:8081
|
BEAM_PROXY_URL: http://beam-proxy-eric:8081
|
||||||
RETRY_COUNT: ${FOCUS_RETRY_COUNT}
|
RETRY_COUNT: ${FOCUS_RETRY_COUNT}
|
||||||
|
OBFUSCATE_BBMRI_ERIC_WAY: "true"
|
||||||
depends_on:
|
depends_on:
|
||||||
- "beam-proxy-eric"
|
- "beam-proxy-eric"
|
||||||
- "blaze"
|
- "blaze"
|
||||||
|
|||||||
@@ -337,8 +337,8 @@ function sync_secrets() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function secret_sync_gitlab_token() {
|
function secret_sync_gitlab_token() {
|
||||||
if [[ "$PROJECT" != "dktk" && "$PROJECT" != "bbmri" ]]; then
|
if [[ "$PROJECT" != "ccp" && "$PROJECT" != "bbmri" ]]; then
|
||||||
log "INFO" "Not running Secret Sync for project minimal"
|
log "INFO" "Not running Secret Sync for project $PROJECT"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
# Map the origin of the git repository /etc/bridgehead to the prefix recognized by Secret Sync
|
# Map the origin of the git repository /etc/bridgehead to the prefix recognized by Secret Sync
|
||||||
|
|||||||
@@ -2,14 +2,12 @@ version: "3.7"
|
|||||||
services:
|
services:
|
||||||
lens:
|
lens:
|
||||||
container_name: lens-federated-search
|
container_name: lens-federated-search
|
||||||
image: docker.verbis.dkfz.de/ccp/lens:pscc
|
image: docker.verbis.dkfz.de/ccp/lens:${SITE_ID}
|
||||||
labels:
|
labels:
|
||||||
- "traefik.http.services.lens.loadbalancer.server.port=3000"
|
- "traefik.http.services.lens.loadbalancer.server.port=3000"
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.lens.rule=Host(`${HOST}`)"
|
- "traefik.http.routers.lens.rule=Host(`${HOST}`)"
|
||||||
- "traefik.http.routers.lens.tls=true"
|
- "traefik.http.routers.lens.tls=true"
|
||||||
environment:
|
|
||||||
PUBLIC_SPOT_URL: "https://${HOST}/prod"
|
|
||||||
|
|
||||||
spot:
|
spot:
|
||||||
image: samply/rustyspot:latest
|
image: samply/rustyspot:latest
|
||||||
@@ -40,7 +38,3 @@ services:
|
|||||||
- "traefik.http.middlewares.stripprefix_spot.stripprefix.prefixes=/prod"
|
- "traefik.http.middlewares.stripprefix_spot.stripprefix.prefixes=/prod"
|
||||||
- "traefik.http.routers.spot.tls=true"
|
- "traefik.http.routers.spot.tls=true"
|
||||||
- "traefik.http.routers.spot.middlewares=corsheaders2,stripprefix_spot,auth"
|
- "traefik.http.routers.spot.middlewares=corsheaders2,stripprefix_spot,auth"
|
||||||
|
|
||||||
beam-proxy:
|
|
||||||
environment:
|
|
||||||
APP_spot_KEY: ${FOCUS_BEAM_SECRET_SHORT}
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
FOCUS_TAG=develop
|
FOCUS_TAG=develop
|
||||||
BEAM_TAG=develop
|
BEAM_TAG=develop
|
||||||
BLAZE_TAG=main
|
BLAZE_TAG=0.32
|
||||||
POSTGRES_TAG=15.13-alpine
|
POSTGRES_TAG=15.13-alpine
|
||||||
TEILER_DASHBOARD_TAG=develop
|
TEILER_DASHBOARD_TAG=develop
|
||||||
MTBA_TAG=develop
|
MTBA_TAG=develop
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
FOCUS_TAG=develop
|
FOCUS_TAG=develop
|
||||||
BEAM_TAG=develop
|
BEAM_TAG=develop
|
||||||
BLAZE_TAG=main
|
BLAZE_TAG=0.32
|
||||||
POSTGRES_TAG=15.13-alpine
|
POSTGRES_TAG=15.13-alpine
|
||||||
TEILER_DASHBOARD_TAG=develop
|
TEILER_DASHBOARD_TAG=develop
|
||||||
MTBA_TAG=develop
|
MTBA_TAG=develop
|
||||||
Reference in New Issue
Block a user