diff --git a/docker-compose.yaml b/docker-compose.yaml index 73baade..b542c71 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -237,7 +237,7 @@ services: - hedgedoc_backend # Flechsig Uwe - # opticswiki + # opticswiki # webcontent: # lx-fs-01.psi.ch:/lx_webhosting opticswiki: @@ -276,13 +276,13 @@ services: networks: - backend -# Ritter Tom -# It-Strategy monitoring dashboard + # Ritter Tom + # It-Strategy monitoring dashboard it-strategy-dashboard-frontend: image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.4 container_name: it-strategy-dashboard-frontend - command: ["sh","-c","/usr/local/bin/copyData.sh"] + command: ["sh", "-c", "/usr/local/bin/copyData.sh"] volumes: - /opt/webcontent/it-strategy-dashboard/frontend:/opt/webcontent/it-strategy-dashboard/frontend restart: "no" @@ -325,13 +325,22 @@ services: networks: - it_strategy_dashboard_backend healthcheck: - test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-u${IT_DASHBOARD_DB_USER}", "-p${IT_DASHBOARD_DB_PW}"] + test: + [ + "CMD", + "mariadb-admin", + "ping", + "-h", + "localhost", + "-u${IT_DASHBOARD_DB_USER}", + "-p${IT_DASHBOARD_DB_PW}", + ] interval: 2s timeout: 5s retries: 5 -# Christoph Hug , Simon Suter -# Panda-Maintenance (OpenMaint) + # Christoph Hug , Simon Suter + # Panda-Maintenance (OpenMaint) panda-maintenance-db: image: postgis/postgis:17-3.5-alpine container_name: panda-maintenance-db @@ -344,7 +353,7 @@ services: mem_limit: 4000m mem_reservation: 2000m healthcheck: - test: [ "CMD-SHELL", "pg_isready -U postgres" ] + test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 30s timeout: 10s retries: 3 @@ -373,7 +382,7 @@ services: mem_limit: 6000m mem_reservation: 3500m healthcheck: - test: [ "CMD", "curl", "-f", "-L", "http://localhost:8080/cmdbuild/ui" ] + test: ["CMD", "curl", "-f", "-L", "http://localhost:8080/cmdbuild/ui"] interval: 30s timeout: 10s retries: 5 @@ -428,10 +437,10 @@ services: restart: always volumes: - /opt/webcontent/tiadocrouter-prod/work:/application/work -# - /opt/webcontent/tiadocrouter-prod/input:/application/input + # - /opt/webcontent/tiadocrouter-prod/input:/application/input - /opt/webcontent/tiadocrouter-prod/lib:/application/lib - /opt/webcontent/tiadocrouter-prod/config:/application/config -# - :/application/dr-instance-01-input + # - :/application/dr-instance-01-input environment: LOGGING_LEVEL_ROOT: INFO # Authentifizierung für WebUI @@ -452,7 +461,7 @@ services: - /opt/webcontent/tiadocrouter-test/log:/application/log - /opt/webcontent/tiadocrouter-test/lib:/application/lib - /opt/webcontent/tiadocrouter-test/config:/application/config -# - :/application/dr-instance-01-input + # - :/application/dr-instance-01-input environment: LOGGING_LEVEL_ROOT: INFO # Authentifizierung für WebUI @@ -460,6 +469,17 @@ services: WEBAPP_SECURITY_AUTH_BASIC_PASSWORD: "$$2y$$10$$LA.TjBKRIDM/c6AJ86BZ/elpa9InzVbzqzLsyfc1Wt7h3S3N8MUPm" networks: - backend + banf-fetcher: + image: python:3.12 + volumes: + - /opt/webcontent/tiadocrouter-test/banf-data:/data + environment: + - SCP_HOST=filetransfer.test.openordering.de + - SCP_PORT=22 + - SFTP_USER=PSITest + - SFTP_PASSWORD=${BANF_FETCHER_TEST_PASSWORD} + - SCP_REMOTE_DIR=Anlagen + - SCP_HOSTKEY_FINGERPRINT="ssh-rsa 1024 fingerprint" # Lange Clemens # summer-project-selection.psi.ch @@ -565,4 +585,3 @@ networks: it_strategy_dashboard_backend: panda_maintenance_backend: tomcatwiki_backend: -