From ecf791568e18ac07cef7524a188f2130163fb718 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 26 Oct 2026 15:10:10 +0100 Subject: [PATCH] CI and split stack Signed-off-by: Basil Bruhn --- .gitea/workflows/webhosting-dmz.yaml | 36 + Readme.md | 29 +- docker-compose.yaml | 723 +------------------ stacks/clic/compose.yaml | 186 +++++ stacks/drsa-tiermaker/compose.yaml | 60 ++ stacks/leaps/compose.yaml | 33 + stacks/legacy-web/compose.yaml | 19 + stacks/mcda/compose.yaml | 100 +++ stacks/mealplanner/compose.yaml | 16 + stacks/pepisco/compose.yaml | 10 + stacks/pocketapp/compose.yaml | 11 + stacks/proxy/compose.yaml | 23 + stacks/psitrail/compose.yaml | 11 + stacks/rhodo/compose.yaml | 23 + stacks/scicat-rocrate/compose.yaml | 33 + stacks/summer-project-selection/compose.yaml | 14 + stacks/swiss-ecargo/compose.yaml | 11 + stacks/tubulinxyz/compose.yaml | 160 ++++ 18 files changed, 803 insertions(+), 695 deletions(-) create mode 100644 .gitea/workflows/webhosting-dmz.yaml create mode 100644 stacks/clic/compose.yaml create mode 100644 stacks/drsa-tiermaker/compose.yaml create mode 100644 stacks/leaps/compose.yaml create mode 100644 stacks/legacy-web/compose.yaml create mode 100644 stacks/mcda/compose.yaml create mode 100644 stacks/mealplanner/compose.yaml create mode 100644 stacks/pepisco/compose.yaml create mode 100644 stacks/pocketapp/compose.yaml create mode 100644 stacks/proxy/compose.yaml create mode 100644 stacks/psitrail/compose.yaml create mode 100644 stacks/rhodo/compose.yaml create mode 100644 stacks/scicat-rocrate/compose.yaml create mode 100644 stacks/summer-project-selection/compose.yaml create mode 100644 stacks/swiss-ecargo/compose.yaml create mode 100644 stacks/tubulinxyz/compose.yaml diff --git a/.gitea/workflows/webhosting-dmz.yaml b/.gitea/workflows/webhosting-dmz.yaml new file mode 100644 index 0000000..02388c0 --- /dev/null +++ b/.gitea/workflows/webhosting-dmz.yaml @@ -0,0 +1,36 @@ +name: WebHosting DMZ + +on: + pull_request: + branches: [main] + push: + branches: [main] + + workflow_dispatch: + +jobs: + validate: + runs-on: webhosting + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Lint and check Compose syntax + run: | + set -e + yamllint -d '{extends: relaxed, rules: {line-length: disable}}' docker-compose.yaml stacks .gitea + docker compose config --quiet + + deploy: + needs: validate + if: github.event_name == 'push' && github.ref == 'refs/heads/main' + runs-on: webhosting + steps: + - name: Deploy + run: | + set -e + cd /opt/WebHosting_DMZ + git pull --ff-only origin main + docker compose up -d + docker compose exec -T nginx nginx -t + docker compose exec -T nginx nginx -s reload diff --git a/Readme.md b/Readme.md index 55d74d1..b7fb32b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,14 +1,29 @@ -# Overview +# WebHosting DMZ -This repository contains the configuration and setup instructions for hosting web applications in a DMZ environment. +Shared DMZ web applications behind Nginx/Apache, deployed in +`/opt/WebHosting_DMZ`. -# Deployment Instructions +- `docker-compose.yaml` combines `stacks//compose.yaml` into one Compose + project. Run commands from the repository root so relative paths and `.env` + resolve from there. +- Only Nginx publishes host ports (`80`/`443`) and joins `public` and `backend`. + Web applications share `backend`; databases use their separate application + networks. +- Puppet manages the deployment `.env` and the Nginx configuration on the host. +- All virtual hosts use the proxy's existing shared certificate. This repository's + deployment workflow therefore does not request or link certificates. -Upon approval and merge of a pull request a manual deployment and reload of the configuration need to be done on the hosting server. +Gitea Actions lints YAML and validates the complete Compose model for pull +requests and pushes. After a merge to `main`, it updates `/opt/WebHosting_DMZ`, +starts the Compose project, validates Nginx, and reloads it. Failed commands stop +the job; there is no automatic rollback. + +For a manual deployment, run: ```bash cd /opt/WebHosting_DMZ -docker compose up -d . -# Reload the Nginx configuration as sometimes backend changes might change the backend ip addresses and the dns caching of nginx need to be refreshed -docker exec nginx_proxy nginx -s reload +git pull --ff-only origin main +docker compose up -d +docker compose exec -T nginx nginx -t +docker compose exec -T nginx nginx -s reload ``` diff --git a/docker-compose.yaml b/docker-compose.yaml index e457ed1..c1a5f3f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,692 +1,39 @@ -services: - # linux-eng@psi.ch - nginx: - image: gitea.psi.ch/images/nginx:1.31.8 - container_name: nginx_proxy - restart: always - ports: - - "80:80" - - "443:443" - volumes: - - /etc/letsencrypt/live:/etc/letsencrypt/live:ro - - /etc/letsencrypt/archive:/etc/letsencrypt/archive:ro - - /etc/pki/tls/certs:/etc/nginx/certs:ro - - /etc/pki/tls/private:/etc/nginx/private:ro - - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - - /etc/nginx/conf.d:/etc/nginx/conf.d:ro - - /opt/webcontent/sinqstatus:/opt/webcontent/sinqstatus:ro - - /mount/actris:/opt/webcontent/actris:ro - - /opt/webcontent/DMZ:/opt/webcontent/DMZ:rw - networks: - - public - - backend - - # rfwtools - # gfa-status-test - apache: - image: gitea.psi.ch/images/php-apache:latest - container_name: apache_app - restart: always - volumes: - - /opt/webcontent/DMZ/rfmwtools:/var/www/rfmwtools:ro - - /opt/webcontent/DMZ/fluid-eos:/var/www/fluid-eos:rw - - /opt/webcontent/DMZ/cas-status:/var/www/cas_status:rw - - /mount/srem/webhosting:/var/www/srem:rw - - /mount/webhosting_dmz_write/tcpwiki:/var/www/tcpwiki:rw - - /mount/webhosting_dmz_write/dokuwiki-core:/var/www/dokuwiki-core:r - - /mount/webhosting_dmz_write/omny:/var/www/omny:rw - - ./apache/conf:/etc/apache2/sites-enabled:ro - networks: - - backend - - # MCDA Calculator Huang He - mcda-calculator: - image: gitea.psi.ch/images/mcda-calculator:1.0.3 - container_name: mcda-calculator - restart: always - networks: - - backend - - # MCDA DSS Huang He - mcda-dss: - image: gitea.psi.ch/images/mcda-dss:0.5.0 - container_name: mcda-dss - restart: always - networks: - - backend - - # MCDA SRF Huang He - mcda-srf: - image: gitea.psi.ch/images/mcda-srf:1.0.3 - container_name: mcda-srf - restart: always - networks: - - backend - - # River Huang - # UP-MAVT-Suite - up-mavt-suite-mongo: - image: mongo:7.0 - container_name: up-mavt-suite-mongo - environment: - MONGO_INITDB_DATABASE: elicitation - volumes: - - /opt/webcontent/up-mavt-suite/mongo-data:/data/db - networks: - - up_mavt_suite_network - restart: always - - up-mavt-suite-backend: - image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.8 - container_name: up-mavt-suite-backend - environment: - MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - FLASK_ENV: production - ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} - OAUTH2_CLIENT_SECRET: ${MCDA_OAUTH2_SECRET} - SMTP_HOST: smtp.office365.com - SMTP_PORT: 587 - SMTP_USER: mcda@psi.ch - EMAIL_AUTH_MODE: oauth2 - OAUTH2_TENANT_ID: 50f89ee2-f910-47c5-9913-a6ea08928f11 - OAUTH2_CLIENT_ID: 201ba262-3c76-41fb-8942-dcefb7729caa - OAUTH2_SCOPE: https://outlook.office365.com/.default - OAUTH2_USERNAME: mcda@psi.ch - SMTP_USE_TLS: true - EMAIL_FROM: mcda@psi.ch - APP_BASE_URL: https://mcda-up.psi.ch/ - depends_on: - - up-mavt-suite-mongo - networks: - - up_mavt_suite_network - - backend - restart: always - - up-mavt-suite-worker: - image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.8 - container_name: up-mavt-suite-worker - environment: - MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - depends_on: - - up-mavt-suite-mongo - networks: - - up_mavt_suite_network - restart: always - - up-mavt-suite-frontend: - image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.8 - container_name: up-mavt-suite-frontend - environment: - VITE_DEBUG_CONSOLE: true - depends_on: - - up-mavt-suite-backend - networks: - - up_mavt_suite_network - - backend - restart: always - - # MCDA PCT tool - # River Huang - mcda-pct: - image: gitea.psi.ch/images/mcda-pct:0.2.0 - container_name: mcda-pct - restart: always - networks: - - backend - - # Romain Sacchi - swiss-ecargo: - image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2 - container_name: swiss-ecargo - restart: always - environment: - - HOSTED_API_KEY=${ecargo_api_key} - networks: - - backend - - # Romain Sacchi - # CLIC Django platform - clic-web: - image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} - container_name: clic-web - restart: always - env_file: - - /mount/webhosting_dmz_write/clic/clic.env - environment: - - DJANGO_SETTINGS_MODULE=config.settings.production - - POSTGRES_HOST=clic-db - - POSTGRES_PORT=5432 - - CLIC_CACHE_BACKEND=redis - - CLIC_REDIS_URL=redis://clic-redis:6379/0 - - CLIC_REQUIRE_SHARED_CACHE=1 - - INVENTORY_ARCHIVE_ENVIRONMENT=production - - INVENTORY_ARCHIVE_AUTO_RESTORE=1 - - INVENTORY_ARCHIVE_PUBLISH_MODE=off - - INVENTORY_ARCHIVE_TERMS_REVIEWED=0 - - INVENTORY_ARCHIVE_TOKEN= - - INVENTORY_ARCHIVE_OWNER_ID=86122 - - INVENTORY_ARCHIVE_SERIES_ID=22850223 - - INVENTORY_ARCHIVE_BOOTSTRAP_RECORD_ID= - - INVENTORY_ARCHIVE_BOOTSTRAP_SHA256= - volumes: - - /mount/webhosting_dmz_write/clic/media:/app/media - - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro - depends_on: - clic-db: - condition: service_healthy - clic-redis: - condition: service_started - healthcheck: - # Match the public host and proxy scheme while probing the local listener. - test: - - CMD - - python - - -c - - "import urllib.request; r = urllib.request.Request('http://127.0.0.1:8000/health/ready/', headers={'Host': 'clic.psi.ch', 'X-Forwarded-Proto': 'https'}); urllib.request.urlopen(r, timeout=5)" - interval: 30s - timeout: 5s - retries: 5 - start_period: 10m - networks: - - backend - - clic_backend - - clic-package-exports: - image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} - container_name: clic-package-exports - restart: always - env_file: - - /mount/webhosting_dmz_write/clic/clic.env - environment: - - DJANGO_SETTINGS_MODULE=config.settings.production - - POSTGRES_HOST=clic-db - - POSTGRES_PORT=5432 - - CLIC_CACHE_BACKEND=redis - - CLIC_REDIS_URL=redis://clic-redis:6379/0 - - CLIC_REQUIRE_SHARED_CACHE=1 - - INVENTORY_ARCHIVE_AUTO_RESTORE=0 - - INVENTORY_ARCHIVE_PUBLISH_MODE=off - - INVENTORY_ARCHIVE_TOKEN= - volumes: - - /mount/webhosting_dmz_write/clic/media:/app/media - - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro - entrypoint: ["python"] - command: ["manage.py", "process_package_exports"] - depends_on: - clic-web: - condition: service_healthy - clic-db: - condition: service_healthy - clic-redis: - condition: service_started - networks: - - clic_backend - - clic-brightway-json-exports: - image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} - container_name: clic-brightway-json-exports - restart: always - env_file: - - /mount/webhosting_dmz_write/clic/clic.env - environment: - - DJANGO_SETTINGS_MODULE=config.settings.production - - POSTGRES_HOST=clic-db - - POSTGRES_PORT=5432 - - CLIC_CACHE_BACKEND=redis - - CLIC_REDIS_URL=redis://clic-redis:6379/0 - - CLIC_REQUIRE_SHARED_CACHE=1 - - INVENTORY_ARCHIVE_AUTO_RESTORE=0 - - INVENTORY_ARCHIVE_PUBLISH_MODE=off - - INVENTORY_ARCHIVE_TOKEN= - volumes: - - /mount/webhosting_dmz_write/clic/media:/app/media - - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro - entrypoint: ["python"] - command: - [ - "manage.py", - "process_brightway_json_exports", - "--skip-checks", - "--sleep", - "${CLIC_API_EXPORT_POLL_SECONDS:-2}", - ] - depends_on: - clic-web: - condition: service_healthy - clic-db: - condition: service_healthy - clic-redis: - condition: service_started - networks: - - clic_backend - - clic-inventory-archive: - image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} - container_name: clic-inventory-archive - restart: always - env_file: - - /mount/webhosting_dmz_write/clic/clic.env - environment: - - DJANGO_SETTINGS_MODULE=config.settings.production - - POSTGRES_HOST=clic-db - - POSTGRES_PORT=5432 - - CLIC_CACHE_BACKEND=redis - - CLIC_REDIS_URL=redis://clic-redis:6379/0 - - CLIC_REQUIRE_SHARED_CACHE=1 - - IMPACT_SCORES_ENABLED=0 - - INVENTORY_ARCHIVE_ENVIRONMENT=production - - INVENTORY_ARCHIVE_AUTO_RESTORE=0 - - INVENTORY_ARCHIVE_PUBLISH_MODE=scheduled - - INVENTORY_ARCHIVE_TERMS_REVIEWED=1 - - INVENTORY_ARCHIVE_OWNER_ID=86122 - - INVENTORY_ARCHIVE_SERIES_ID=22850223 - - INVENTORY_ARCHIVE_BOOTSTRAP_RECORD_ID= - - INVENTORY_ARCHIVE_BOOTSTRAP_SHA256= - - INVENTORY_ARCHIVE_METADATA_FILE=/app/config/inventory-archive-metadata.json - - INVENTORY_ARCHIVE_REDISTRIBUTION_FILE= - - INVENTORY_ARCHIVE_ALERT_EMAIL=romain.sacchi@psi.ch - entrypoint: ["python"] - command: ["manage.py", "run_inventory_archive_worker"] - depends_on: - clic-web: - condition: service_healthy - healthcheck: - test: - ["CMD", "python", "manage.py", "inventory_archive_status", "--alert"] - interval: 5m - timeout: 60s - retries: 1 - start_period: 10m - stop_grace_period: 3m - networks: - - clic_backend - - clic-db: - image: postgres:16 - container_name: clic-db - restart: always - env_file: - - /mount/webhosting_dmz_write/clic/clic.env - environment: - - INVENTORY_ARCHIVE_TOKEN= - volumes: - - /mount/webhosting_dmz_write/clic/postgres:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] - interval: 10s - timeout: 5s - retries: 5 - networks: - - clic_backend - - clic-redis: - image: redis:7-alpine - container_name: clic-redis - restart: always - command: ["redis-server", "--appendonly", "yes"] - volumes: - - /mount/webhosting_dmz_write/clic/redis:/data - networks: - - clic_backend - - # Enea Zeolla - drsa-tiermaker: - image: gitea.psi.ch/images/drsa-tiermaker:0.3.0 - container_name: drsa-tiermaker - restart: always - depends_on: - drsa-tiermaker-db: - condition: service_healthy - environment: - - DATABASE_URL=postgresql+psycopg2://${DRSA_TIERMAKER_DB_USER}:${DRSA_TIERMAKER_DB_PW}@drsa-tiermaker-db:5432/drsa_tiermaker - - SECRET_KEY=${DRSA_TIERMAKER_SECRET_KEY} - - FIRST_ADMIN_EMAIL=mcda@psi.ch - - FIRST_ADMIN_PASSWORD=${DRSA_TIERMAKER_ADMIN_PW} - - ENVIRONMENT=production - - COOKIE_SECURE=true - - DRSA_ENGINE=builtin - - WEB_CONCURRENCY=2 - - CORS_ORIGINS=${DRSA_TIERMAKER_URL} - - APP_BASE_URL=${DRSA_TIERMAKER_URL} - - OAUTH2_CLIENT_SECRET=${MCDA_OAUTH2_SECRET} - - SMTP_HOST=smtp.office365.com - - SMTP_PORT=587 - - SMTP_USER=mcda@psi.ch - - EMAIL_AUTH_MODE=oauth2 - - OAUTH2_TENANT_ID=50f89ee2-f910-47c5-9913-a6ea08928f11 - - OAUTH2_CLIENT_ID=201ba262-3c76-41fb-8942-dcefb7729caa - - OAUTH2_SCOPE=https://outlook.office365.com/.default - - OAUTH2_USERNAME=mcda@psi.ch - - SMTP_USE_TLS=true - - EMAIL_FROM=mcda@psi.ch - networks: - - backend - - drsa_tiermaker_backend - - # Enea Zeolla - drsa-tiermaker-db: - image: postgres:16-alpine - container_name: drsa-tiermaker-db - restart: always - environment: - - POSTGRES_USER=${DRSA_TIERMAKER_DB_USER} - - POSTGRES_PASSWORD=${DRSA_TIERMAKER_DB_PW} - - POSTGRES_DB=drsa_tiermaker - volumes: - - /mount/webhosting_dmz_write/drsa-tiermaker/db-data:/var/lib/postgresql/data - healthcheck: - test: - [ - "CMD-SHELL", - "pg_isready -U ${DRSA_TIERMAKER_DB_USER} -d drsa_tiermaker", - ] - interval: 10s - timeout: 5s - retries: 5 - start_period: 30s - networks: - - drsa_tiermaker_backend - - # Lange Clemens - # summer-project-selection.psi.ch - summer-project-selection: - image: gitea.psi.ch/lange_c/summer-project-selection:latest - container_name: summer-project-selection - restart: always - volumes: - - /mount/webhosting_dmz_write/summer-project-selection/data:/app/data - - /opt/webcontent/DMZ/summer-project-selection/projects:/app/projects - - /opt/webcontent/DMZ/summer-project-selection/applicants:/app/applicants - networks: - - backend - - # PEPISCO - # PhotoElectron PhotoIon Spectral COmpendium - pepisco: - image: gitea.psi.ch/images/pepisco:v2026.03.13 - container_name: pepisco - restart: always - networks: - - backend - - # Only on rhodo_network. The `backend` alias is required because - # the frontend image's internal nginx uses http://backend:8000/ - rhodo-backend: - image: gitea.psi.ch/images/grn_opsins-backend:1.2.0 - container_name: rhodo-backend - restart: always - networks: - rhodo_network: - aliases: - - backend - - rhodo-frontend: - image: gitea.psi.ch/images/grn_opsins-frontend:1.2.0 - container_name: rhodo-frontend - restart: always - depends_on: - - rhodo-backend - networks: - - rhodo_network - - backend - - scicat-rocrate-qa: - image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.7.0-rc-aare-import.5 - container_name: scicat-rocrate-qa - restart: always - networks: - - backend - environment: - - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat-qa.psi.ch - - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.qa.psi.ch - - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G - - SCICAT_PID_PREFIX=20.500.11935 - - QUARKUS_LOG_FILE_ENABLE=true - - QUARKUS_LOG_FILE_PATH=/rocrate/scicat-rocrate-qa.log - volumes: - - /mount/rocrate_qa:/rocrate:rw - - scicat-rocrate: - image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.15 - container_name: scicat-rocrate - restart: always - networks: - - backend - environment: - - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat.psi.ch - - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.psi.ch - - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G - - SCICAT_PID_PREFIX=20.500.11935 - - QUARKUS_LOG_FILE_ENABLE=true - - QUARKUS_LOG_FILE_PATH=/rocrate/scicat-rocrate.log - volumes: - - /mount/rocrate_prod:/rocrate:rw - - # LEAPS ultrafast frithjof.nolting@psi.ch - felira-web: - image: gitea.psi.ch/leaps/leaps-felira:main - container_name: felira-web - restart: always - # volumes: - # - /mount/webhosting_dmz_write/leaps/web:/var/www/html:rw - depends_on: - - felira-database - networks: - - backend - - leaps_db - environment: - - DB_DATABASE=felira_leaps_ultrafast - - DB_USERNAME=felira_leaps_ultrafast - - DB_PASSWORD=${LEAPS_DB_PW} - felira-database: - image: mariadb:latest - container_name: felira-database - restart: always - environment: - - MARIADB_ROOT_PASSWORD=${LEAPS_DB_PW} - - MARIADB_DATABASE=felira_leaps_ultrafast - - MARIADB_USER=felira_leaps_ultrafast - - MARIADB_PASSWORD=${LEAPS_DB_PW} - volumes: - - /mount/webhosting_dmz_write/leaps/db_data:/var/lib/mysql - - /mount/webhosting_dmz_write/leaps/init-db:/docker-entrypoint-initdb.d:ro - networks: - - leaps_db - - # Noah Pombas Teixeira De Freitas / - # PSI Trail - psitrail.psi.ch - # Image: gitea.psi.ch/bb_if_produktiv/psitrail:181 - psitrail: - image: gitea.psi.ch/bb_if_produktiv/psitrail:199 - container_name: psitrail - restart: always - networks: - - backend - - # Noah Pombas Teixeira De Freitas / - # Pocket App - pocket.psi.ch - # Image: gitea.psi.ch/bb_if_produktiv/pocketapp:17 - pocketapp: - image: gitea.psi.ch/bb_if_produktiv/pocketapp:23 - container_name: pocketapp - restart: always - networks: - - backend - - # Noah Pombas Teixeira De Freitas - # Meal planner API - mealplanner-api: - image: gitea.psi.ch/bb_if_produktiv/mealplanner-api-v2:3 - container_name: mealplanner-api - restart: always - environment: - PORT: 5000 - API_KEY: ${MEALPLANNER_API_KEY} - DATA_DIR: /app/data - volumes: - - /mount/webhosting_dmz_write/mealplanner/data:/app/data - networks: - - backend - - # João Pedro Agostinho de Sousa - # tubulin.xyz - neo4j: - image: neo4j:5.26-community - environment: - NEO4J_AUTH: neo4j/${NEO4J_PASSWORD} - NEO4J_server_memory_heap_initial__size: 1G - NEO4J_server_memory_heap_max__size: 2G - NEO4J_server_memory_pagecache_size: 1G - volumes: - - /mount/webhosting_dmz_write/tubulin/neo4j/data:/data - - /mount/webhosting_dmz_write/tubulin/neo4j/logs:/logs - healthcheck: - test: - [ - "CMD", - "cypher-shell", - "-u", - "neo4j", - "-p", - "${NEO4J_PASSWORD}", - "RETURN 1", - ] - interval: 10s - timeout: 5s - retries: 10 - start_period: 30s - restart: always - networks: - - tubulinxyz_backend - stop_grace_period: 60s - logging: - driver: json-file - options: - max-size: "50m" - max-file: "5" - deploy: - resources: - limits: - memory: 4G - - bootstrap: - image: ghcr.io/rtviii/tubulinxyz:0.2.1 - pull_policy: always - environment: - NEO4J_URI: bolt://neo4j:7687 - NEO4J_USER: neo4j - NEO4J_PASSWORD: ${NEO4J_PASSWORD} - TUBXZ_ROOT: /app - TUBETL_DATA: /mnt/tubetl_data - NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite - volumes: - - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data - - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz - depends_on: - neo4j: - condition: service_healthy - entrypoint: ["/bin/sh", "/app/scripts/init_and_seed.sh"] - restart: always - networks: - - tubulinxyz_backend - logging: - driver: json-file - options: - max-size: "50m" - max-file: "3" - deploy: - resources: - limits: - memory: 4G - - backend: - image: ghcr.io/rtviii/tubulinxyz:0.2.1 - pull_policy: always - environment: - NEO4J_URI: bolt://neo4j:7687 - NEO4J_USER: neo4j - NEO4J_PASSWORD: ${NEO4J_PASSWORD} - SECRET_KEY: ${SECRET_KEY} - TUBXZ_ROOT: /app - TUBETL_DATA: /mnt/tubetl_data - NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite - volumes: - - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data - - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz:ro - depends_on: - neo4j: - condition: service_healthy - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000/health"] - interval: 30s - timeout: 5s - retries: 3 - start_period: 15s - restart: always - networks: - - backend - - tubulinxyz_backend - stop_grace_period: 30s - logging: - driver: json-file - options: - max-size: "50m" - max-file: "5" - deploy: - resources: - limits: - memory: 2G - - scheduler: - image: ghcr.io/rtviii/tubulinxyz:0.2.1 - pull_policy: always - environment: - NEO4J_URI: bolt://neo4j:7687 - NEO4J_USER: neo4j - NEO4J_PASSWORD: ${NEO4J_PASSWORD} - TUBXZ_ROOT: /app - TUBETL_DATA: /mnt/tubetl_data - NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite - volumes: - - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data - - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz - depends_on: - neo4j: - condition: service_healthy - entrypoint: ["/bin/sh", "/app/scripts/start_scheduler.sh"] - restart: always - networks: - - tubulinxyz_backend - logging: - driver: json-file - options: - max-size: "50m" - max-file: "5" - deploy: - resources: - limits: - memory: 4G - - frontend: - image: ghcr.io/rtviii/tubulinxyz-frontend:0.2.0 - pull_policy: always - depends_on: - backend: - condition: service_healthy - restart: always - networks: - - backend - - tubulinxyz_backend - logging: - driver: json-file - options: - max-size: "50m" - max-file: "3" - deploy: - resources: - limits: - memory: 512M +# Requires Docker Compose 2.20.3 or later (include support). +# Run Compose from this directory to keep the existing project and .env. +# All modules resolve relative paths and their default .env from this root. +include: + - path: stacks/proxy/compose.yaml + project_directory: . + - path: stacks/legacy-web/compose.yaml + project_directory: . + - path: stacks/mcda/compose.yaml + project_directory: . + - path: stacks/swiss-ecargo/compose.yaml + project_directory: . + - path: stacks/clic/compose.yaml + project_directory: . + - path: stacks/drsa-tiermaker/compose.yaml + project_directory: . + - path: stacks/summer-project-selection/compose.yaml + project_directory: . + - path: stacks/pepisco/compose.yaml + project_directory: . + - path: stacks/rhodo/compose.yaml + project_directory: . + - path: stacks/scicat-rocrate/compose.yaml + project_directory: . + - path: stacks/leaps/compose.yaml + project_directory: . + - path: stacks/psitrail/compose.yaml + project_directory: . + - path: stacks/pocketapp/compose.yaml + project_directory: . + - path: stacks/mealplanner/compose.yaml + project_directory: . + - path: stacks/tubulinxyz/compose.yaml + project_directory: . +# Network definitions remain shared by the single Compose project. networks: public: backend: diff --git a/stacks/clic/compose.yaml b/stacks/clic/compose.yaml new file mode 100644 index 0000000..0c8ea15 --- /dev/null +++ b/stacks/clic/compose.yaml @@ -0,0 +1,186 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Romain Sacchi + # CLIC Django platform + clic-web: + image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} + container_name: clic-web + restart: always + env_file: + - /mount/webhosting_dmz_write/clic/clic.env + environment: + - DJANGO_SETTINGS_MODULE=config.settings.production + - POSTGRES_HOST=clic-db + - POSTGRES_PORT=5432 + - CLIC_CACHE_BACKEND=redis + - CLIC_REDIS_URL=redis://clic-redis:6379/0 + - CLIC_REQUIRE_SHARED_CACHE=1 + - INVENTORY_ARCHIVE_ENVIRONMENT=production + - INVENTORY_ARCHIVE_AUTO_RESTORE=1 + - INVENTORY_ARCHIVE_PUBLISH_MODE=off + - INVENTORY_ARCHIVE_TERMS_REVIEWED=0 + - INVENTORY_ARCHIVE_TOKEN= + - INVENTORY_ARCHIVE_OWNER_ID=86122 + - INVENTORY_ARCHIVE_SERIES_ID=22850223 + - INVENTORY_ARCHIVE_BOOTSTRAP_RECORD_ID= + - INVENTORY_ARCHIVE_BOOTSTRAP_SHA256= + volumes: + - /mount/webhosting_dmz_write/clic/media:/app/media + - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro + depends_on: + clic-db: + condition: service_healthy + clic-redis: + condition: service_started + healthcheck: + # Match the public host and proxy scheme while probing the local listener. + test: + - CMD + - python + - -c + - "import urllib.request; r = urllib.request.Request('http://127.0.0.1:8000/health/ready/', headers={'Host': 'clic.psi.ch', 'X-Forwarded-Proto': 'https'}); urllib.request.urlopen(r, timeout=5)" + interval: 30s + timeout: 5s + retries: 5 + start_period: 10m + networks: + - backend + - clic_backend + + clic-package-exports: + image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} + container_name: clic-package-exports + restart: always + env_file: + - /mount/webhosting_dmz_write/clic/clic.env + environment: + - DJANGO_SETTINGS_MODULE=config.settings.production + - POSTGRES_HOST=clic-db + - POSTGRES_PORT=5432 + - CLIC_CACHE_BACKEND=redis + - CLIC_REDIS_URL=redis://clic-redis:6379/0 + - CLIC_REQUIRE_SHARED_CACHE=1 + - INVENTORY_ARCHIVE_AUTO_RESTORE=0 + - INVENTORY_ARCHIVE_PUBLISH_MODE=off + - INVENTORY_ARCHIVE_TOKEN= + volumes: + - /mount/webhosting_dmz_write/clic/media:/app/media + - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro + entrypoint: ["python"] + command: ["manage.py", "process_package_exports"] + depends_on: + clic-web: + condition: service_healthy + clic-db: + condition: service_healthy + clic-redis: + condition: service_started + networks: + - clic_backend + + clic-brightway-json-exports: + image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} + container_name: clic-brightway-json-exports + restart: always + env_file: + - /mount/webhosting_dmz_write/clic/clic.env + environment: + - DJANGO_SETTINGS_MODULE=config.settings.production + - POSTGRES_HOST=clic-db + - POSTGRES_PORT=5432 + - CLIC_CACHE_BACKEND=redis + - CLIC_REDIS_URL=redis://clic-redis:6379/0 + - CLIC_REQUIRE_SHARED_CACHE=1 + - INVENTORY_ARCHIVE_AUTO_RESTORE=0 + - INVENTORY_ARCHIVE_PUBLISH_MODE=off + - INVENTORY_ARCHIVE_TOKEN= + volumes: + - /mount/webhosting_dmz_write/clic/media:/app/media + - /mount/webhosting_dmz_write/clic/impact_factors:/app/data/impact_factors:ro + entrypoint: ["python"] + command: + [ + "manage.py", + "process_brightway_json_exports", + "--skip-checks", + "--sleep", + "${CLIC_API_EXPORT_POLL_SECONDS:-2}", + ] + depends_on: + clic-web: + condition: service_healthy + clic-db: + condition: service_healthy + clic-redis: + condition: service_started + networks: + - clic_backend + + clic-inventory-archive: + image: ${CLIC_IMAGE:-gitea.psi.ch/images/clic:dab21a5-missing-foreground-2a1fe954da76@sha256:1e13386f3a435681be61900707f11f858faee22171e644912bba7b7df3a19fd2} + container_name: clic-inventory-archive + restart: always + env_file: + - /mount/webhosting_dmz_write/clic/clic.env + environment: + - DJANGO_SETTINGS_MODULE=config.settings.production + - POSTGRES_HOST=clic-db + - POSTGRES_PORT=5432 + - CLIC_CACHE_BACKEND=redis + - CLIC_REDIS_URL=redis://clic-redis:6379/0 + - CLIC_REQUIRE_SHARED_CACHE=1 + - IMPACT_SCORES_ENABLED=0 + - INVENTORY_ARCHIVE_ENVIRONMENT=production + - INVENTORY_ARCHIVE_AUTO_RESTORE=0 + - INVENTORY_ARCHIVE_PUBLISH_MODE=scheduled + - INVENTORY_ARCHIVE_TERMS_REVIEWED=1 + - INVENTORY_ARCHIVE_OWNER_ID=86122 + - INVENTORY_ARCHIVE_SERIES_ID=22850223 + - INVENTORY_ARCHIVE_BOOTSTRAP_RECORD_ID= + - INVENTORY_ARCHIVE_BOOTSTRAP_SHA256= + - INVENTORY_ARCHIVE_METADATA_FILE=/app/config/inventory-archive-metadata.json + - INVENTORY_ARCHIVE_REDISTRIBUTION_FILE= + - INVENTORY_ARCHIVE_ALERT_EMAIL=romain.sacchi@psi.ch + entrypoint: ["python"] + command: ["manage.py", "run_inventory_archive_worker"] + depends_on: + clic-web: + condition: service_healthy + healthcheck: + test: + ["CMD", "python", "manage.py", "inventory_archive_status", "--alert"] + interval: 5m + timeout: 60s + retries: 1 + start_period: 10m + stop_grace_period: 3m + networks: + - clic_backend + + clic-db: + image: postgres:16 + container_name: clic-db + restart: always + env_file: + - /mount/webhosting_dmz_write/clic/clic.env + environment: + - INVENTORY_ARCHIVE_TOKEN= + volumes: + - /mount/webhosting_dmz_write/clic/postgres:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - clic_backend + + clic-redis: + image: redis:7-alpine + container_name: clic-redis + restart: always + command: ["redis-server", "--appendonly", "yes"] + volumes: + - /mount/webhosting_dmz_write/clic/redis:/data + networks: + - clic_backend diff --git a/stacks/drsa-tiermaker/compose.yaml b/stacks/drsa-tiermaker/compose.yaml new file mode 100644 index 0000000..c8a2594 --- /dev/null +++ b/stacks/drsa-tiermaker/compose.yaml @@ -0,0 +1,60 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Enea Zeolla + drsa-tiermaker: + image: gitea.psi.ch/images/drsa-tiermaker:0.3.0 + container_name: drsa-tiermaker + restart: always + depends_on: + drsa-tiermaker-db: + condition: service_healthy + environment: + - DATABASE_URL=postgresql+psycopg2://${DRSA_TIERMAKER_DB_USER}:${DRSA_TIERMAKER_DB_PW}@drsa-tiermaker-db:5432/drsa_tiermaker + - SECRET_KEY=${DRSA_TIERMAKER_SECRET_KEY} + - FIRST_ADMIN_EMAIL=mcda@psi.ch + - FIRST_ADMIN_PASSWORD=${DRSA_TIERMAKER_ADMIN_PW} + - ENVIRONMENT=production + - COOKIE_SECURE=true + - DRSA_ENGINE=builtin + - WEB_CONCURRENCY=2 + - CORS_ORIGINS=${DRSA_TIERMAKER_URL} + - APP_BASE_URL=${DRSA_TIERMAKER_URL} + - OAUTH2_CLIENT_SECRET=${MCDA_OAUTH2_SECRET} + - SMTP_HOST=smtp.office365.com + - SMTP_PORT=587 + - SMTP_USER=mcda@psi.ch + - EMAIL_AUTH_MODE=oauth2 + - OAUTH2_TENANT_ID=50f89ee2-f910-47c5-9913-a6ea08928f11 + - OAUTH2_CLIENT_ID=201ba262-3c76-41fb-8942-dcefb7729caa + - OAUTH2_SCOPE=https://outlook.office365.com/.default + - OAUTH2_USERNAME=mcda@psi.ch + - SMTP_USE_TLS=true + - EMAIL_FROM=mcda@psi.ch + networks: + - backend + - drsa_tiermaker_backend + + # Enea Zeolla + + drsa-tiermaker-db: + image: postgres:16-alpine + container_name: drsa-tiermaker-db + restart: always + environment: + - POSTGRES_USER=${DRSA_TIERMAKER_DB_USER} + - POSTGRES_PASSWORD=${DRSA_TIERMAKER_DB_PW} + - POSTGRES_DB=drsa_tiermaker + volumes: + - /mount/webhosting_dmz_write/drsa-tiermaker/db-data:/var/lib/postgresql/data + healthcheck: + test: + [ + "CMD-SHELL", + "pg_isready -U ${DRSA_TIERMAKER_DB_USER} -d drsa_tiermaker", + ] + interval: 10s + timeout: 5s + retries: 5 + start_period: 30s + networks: + - drsa_tiermaker_backend diff --git a/stacks/leaps/compose.yaml b/stacks/leaps/compose.yaml new file mode 100644 index 0000000..9834338 --- /dev/null +++ b/stacks/leaps/compose.yaml @@ -0,0 +1,33 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # LEAPS ultrafast frithjof.nolting@psi.ch + felira-web: + image: gitea.psi.ch/leaps/leaps-felira:main + container_name: felira-web + restart: always + # volumes: + # - /mount/webhosting_dmz_write/leaps/web:/var/www/html:rw + depends_on: + - felira-database + networks: + - backend + - leaps_db + environment: + - DB_DATABASE=felira_leaps_ultrafast + - DB_USERNAME=felira_leaps_ultrafast + - DB_PASSWORD=${LEAPS_DB_PW} + + felira-database: + image: mariadb:latest + container_name: felira-database + restart: always + environment: + - MARIADB_ROOT_PASSWORD=${LEAPS_DB_PW} + - MARIADB_DATABASE=felira_leaps_ultrafast + - MARIADB_USER=felira_leaps_ultrafast + - MARIADB_PASSWORD=${LEAPS_DB_PW} + volumes: + - /mount/webhosting_dmz_write/leaps/db_data:/var/lib/mysql + - /mount/webhosting_dmz_write/leaps/init-db:/docker-entrypoint-initdb.d:ro + networks: + - leaps_db diff --git a/stacks/legacy-web/compose.yaml b/stacks/legacy-web/compose.yaml new file mode 100644 index 0000000..1a7e4a0 --- /dev/null +++ b/stacks/legacy-web/compose.yaml @@ -0,0 +1,19 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # rfwtools + # gfa-status-test + apache: + image: gitea.psi.ch/images/php-apache:latest + container_name: apache_app + restart: always + volumes: + - /opt/webcontent/DMZ/rfmwtools:/var/www/rfmwtools:ro + - /opt/webcontent/DMZ/fluid-eos:/var/www/fluid-eos:rw + - /opt/webcontent/DMZ/cas-status:/var/www/cas_status:rw + - /mount/srem/webhosting:/var/www/srem:rw + - /mount/webhosting_dmz_write/tcpwiki:/var/www/tcpwiki:rw + - /mount/webhosting_dmz_write/dokuwiki-core:/var/www/dokuwiki-core:r + - /mount/webhosting_dmz_write/omny:/var/www/omny:rw + - ./apache/conf:/etc/apache2/sites-enabled:ro + networks: + - backend diff --git a/stacks/mcda/compose.yaml b/stacks/mcda/compose.yaml new file mode 100644 index 0000000..f38f94a --- /dev/null +++ b/stacks/mcda/compose.yaml @@ -0,0 +1,100 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # MCDA Calculator Huang He + mcda-calculator: + image: gitea.psi.ch/images/mcda-calculator:1.0.3 + container_name: mcda-calculator + restart: always + networks: + - backend + + # MCDA DSS Huang He + + mcda-dss: + image: gitea.psi.ch/images/mcda-dss:0.5.0 + container_name: mcda-dss + restart: always + networks: + - backend + + # MCDA SRF Huang He + + mcda-srf: + image: gitea.psi.ch/images/mcda-srf:1.0.3 + container_name: mcda-srf + restart: always + networks: + - backend + + # River Huang + # UP-MAVT-Suite + + up-mavt-suite-mongo: + image: mongo:7.0 + container_name: up-mavt-suite-mongo + environment: + MONGO_INITDB_DATABASE: elicitation + volumes: + - /opt/webcontent/up-mavt-suite/mongo-data:/data/db + networks: + - up_mavt_suite_network + restart: always + + up-mavt-suite-backend: + image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.8 + container_name: up-mavt-suite-backend + environment: + MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation + FLASK_ENV: production + ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} + OAUTH2_CLIENT_SECRET: ${MCDA_OAUTH2_SECRET} + SMTP_HOST: smtp.office365.com + SMTP_PORT: 587 + SMTP_USER: mcda@psi.ch + EMAIL_AUTH_MODE: oauth2 + OAUTH2_TENANT_ID: 50f89ee2-f910-47c5-9913-a6ea08928f11 + OAUTH2_CLIENT_ID: 201ba262-3c76-41fb-8942-dcefb7729caa + OAUTH2_SCOPE: https://outlook.office365.com/.default + OAUTH2_USERNAME: mcda@psi.ch + SMTP_USE_TLS: true + EMAIL_FROM: mcda@psi.ch + APP_BASE_URL: https://mcda-up.psi.ch/ + depends_on: + - up-mavt-suite-mongo + networks: + - up_mavt_suite_network + - backend + restart: always + + up-mavt-suite-worker: + image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.8 + container_name: up-mavt-suite-worker + environment: + MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation + depends_on: + - up-mavt-suite-mongo + networks: + - up_mavt_suite_network + restart: always + + up-mavt-suite-frontend: + image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.8 + container_name: up-mavt-suite-frontend + environment: + VITE_DEBUG_CONSOLE: true + depends_on: + - up-mavt-suite-backend + networks: + - up_mavt_suite_network + - backend + restart: always + + # MCDA PCT tool + # River Huang + + mcda-pct: + image: gitea.psi.ch/images/mcda-pct:0.2.0 + container_name: mcda-pct + restart: always + networks: + - backend diff --git a/stacks/mealplanner/compose.yaml b/stacks/mealplanner/compose.yaml new file mode 100644 index 0000000..98c5bcd --- /dev/null +++ b/stacks/mealplanner/compose.yaml @@ -0,0 +1,16 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Noah Pombas Teixeira De Freitas + # Meal planner API + mealplanner-api: + image: gitea.psi.ch/bb_if_produktiv/mealplanner-api-v2:3 + container_name: mealplanner-api + restart: always + environment: + PORT: 5000 + API_KEY: ${MEALPLANNER_API_KEY} + DATA_DIR: /app/data + volumes: + - /mount/webhosting_dmz_write/mealplanner/data:/app/data + networks: + - backend diff --git a/stacks/pepisco/compose.yaml b/stacks/pepisco/compose.yaml new file mode 100644 index 0000000..fb4860d --- /dev/null +++ b/stacks/pepisco/compose.yaml @@ -0,0 +1,10 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # PEPISCO + # PhotoElectron PhotoIon Spectral COmpendium + pepisco: + image: gitea.psi.ch/images/pepisco:v2026.03.13 + container_name: pepisco + restart: always + networks: + - backend diff --git a/stacks/pocketapp/compose.yaml b/stacks/pocketapp/compose.yaml new file mode 100644 index 0000000..3affa15 --- /dev/null +++ b/stacks/pocketapp/compose.yaml @@ -0,0 +1,11 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Noah Pombas Teixeira De Freitas / + # Pocket App - pocket.psi.ch + # Image: gitea.psi.ch/bb_if_produktiv/pocketapp:17 + pocketapp: + image: gitea.psi.ch/bb_if_produktiv/pocketapp:23 + container_name: pocketapp + restart: always + networks: + - backend diff --git a/stacks/proxy/compose.yaml b/stacks/proxy/compose.yaml new file mode 100644 index 0000000..6483dc3 --- /dev/null +++ b/stacks/proxy/compose.yaml @@ -0,0 +1,23 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # linux-eng@psi.ch + nginx: + image: gitea.psi.ch/images/nginx:1.31.8 + container_name: nginx_proxy + restart: always + ports: + - "80:80" + - "443:443" + volumes: + - /etc/letsencrypt/live:/etc/letsencrypt/live:ro + - /etc/letsencrypt/archive:/etc/letsencrypt/archive:ro + - /etc/pki/tls/certs:/etc/nginx/certs:ro + - /etc/pki/tls/private:/etc/nginx/private:ro + - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - /etc/nginx/conf.d:/etc/nginx/conf.d:ro + - /opt/webcontent/sinqstatus:/opt/webcontent/sinqstatus:ro + - /mount/actris:/opt/webcontent/actris:ro + - /opt/webcontent/DMZ:/opt/webcontent/DMZ:rw + networks: + - public + - backend diff --git a/stacks/psitrail/compose.yaml b/stacks/psitrail/compose.yaml new file mode 100644 index 0000000..644456e --- /dev/null +++ b/stacks/psitrail/compose.yaml @@ -0,0 +1,11 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Noah Pombas Teixeira De Freitas / + # PSI Trail - psitrail.psi.ch + # Image: gitea.psi.ch/bb_if_produktiv/psitrail:181 + psitrail: + image: gitea.psi.ch/bb_if_produktiv/psitrail:199 + container_name: psitrail + restart: always + networks: + - backend diff --git a/stacks/rhodo/compose.yaml b/stacks/rhodo/compose.yaml new file mode 100644 index 0000000..2213008 --- /dev/null +++ b/stacks/rhodo/compose.yaml @@ -0,0 +1,23 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Only on rhodo_network. The `backend` alias is required because + # the frontend image's internal nginx uses http://backend:8000/ + rhodo-backend: + image: gitea.psi.ch/images/grn_opsins-backend:1.2.0 + container_name: rhodo-backend + restart: always + networks: + rhodo_network: + aliases: + - backend + + rhodo-frontend: + image: gitea.psi.ch/images/grn_opsins-frontend:1.2.0 + container_name: rhodo-frontend + restart: always + depends_on: + - rhodo-backend + networks: + - rhodo_network + - backend + diff --git a/stacks/scicat-rocrate/compose.yaml b/stacks/scicat-rocrate/compose.yaml new file mode 100644 index 0000000..c2abbcd --- /dev/null +++ b/stacks/scicat-rocrate/compose.yaml @@ -0,0 +1,33 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + scicat-rocrate-qa: + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.7.0-rc-aare-import.5 + container_name: scicat-rocrate-qa + restart: always + networks: + - backend + environment: + - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat-qa.psi.ch + - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.qa.psi.ch + - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G + - SCICAT_PID_PREFIX=20.500.11935 + - QUARKUS_LOG_FILE_ENABLE=true + - QUARKUS_LOG_FILE_PATH=/rocrate/scicat-rocrate-qa.log + volumes: + - /mount/rocrate_qa:/rocrate:rw + + scicat-rocrate: + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.15 + container_name: scicat-rocrate + restart: always + networks: + - backend + environment: + - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat.psi.ch + - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.psi.ch + - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G + - SCICAT_PID_PREFIX=20.500.11935 + - QUARKUS_LOG_FILE_ENABLE=true + - QUARKUS_LOG_FILE_PATH=/rocrate/scicat-rocrate.log + volumes: + - /mount/rocrate_prod:/rocrate:rw diff --git a/stacks/summer-project-selection/compose.yaml b/stacks/summer-project-selection/compose.yaml new file mode 100644 index 0000000..9f813b9 --- /dev/null +++ b/stacks/summer-project-selection/compose.yaml @@ -0,0 +1,14 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Lange Clemens + # summer-project-selection.psi.ch + summer-project-selection: + image: gitea.psi.ch/lange_c/summer-project-selection:latest + container_name: summer-project-selection + restart: always + volumes: + - /mount/webhosting_dmz_write/summer-project-selection/data:/app/data + - /opt/webcontent/DMZ/summer-project-selection/projects:/app/projects + - /opt/webcontent/DMZ/summer-project-selection/applicants:/app/applicants + networks: + - backend diff --git a/stacks/swiss-ecargo/compose.yaml b/stacks/swiss-ecargo/compose.yaml new file mode 100644 index 0000000..c4f9988 --- /dev/null +++ b/stacks/swiss-ecargo/compose.yaml @@ -0,0 +1,11 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # Romain Sacchi + swiss-ecargo: + image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2 + container_name: swiss-ecargo + restart: always + environment: + - HOSTED_API_KEY=${ecargo_api_key} + networks: + - backend diff --git a/stacks/tubulinxyz/compose.yaml b/stacks/tubulinxyz/compose.yaml new file mode 100644 index 0000000..e7ff440 --- /dev/null +++ b/stacks/tubulinxyz/compose.yaml @@ -0,0 +1,160 @@ +# Included by ../../docker-compose.yaml; use the root Compose entrypoint. +services: + # João Pedro Agostinho de Sousa + # tubulin.xyz + neo4j: + image: neo4j:5.26-community + environment: + NEO4J_AUTH: neo4j/${NEO4J_PASSWORD} + NEO4J_server_memory_heap_initial__size: 1G + NEO4J_server_memory_heap_max__size: 2G + NEO4J_server_memory_pagecache_size: 1G + volumes: + - /mount/webhosting_dmz_write/tubulin/neo4j/data:/data + - /mount/webhosting_dmz_write/tubulin/neo4j/logs:/logs + healthcheck: + test: + [ + "CMD", + "cypher-shell", + "-u", + "neo4j", + "-p", + "${NEO4J_PASSWORD}", + "RETURN 1", + ] + interval: 10s + timeout: 5s + retries: 10 + start_period: 30s + restart: always + networks: + - tubulinxyz_backend + stop_grace_period: 60s + logging: + driver: json-file + options: + max-size: "50m" + max-file: "5" + deploy: + resources: + limits: + memory: 4G + + bootstrap: + image: ghcr.io/rtviii/tubulinxyz:0.2.1 + pull_policy: always + environment: + NEO4J_URI: bolt://neo4j:7687 + NEO4J_USER: neo4j + NEO4J_PASSWORD: ${NEO4J_PASSWORD} + TUBXZ_ROOT: /app + TUBETL_DATA: /mnt/tubetl_data + NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite + volumes: + - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data + - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz + depends_on: + neo4j: + condition: service_healthy + entrypoint: ["/bin/sh", "/app/scripts/init_and_seed.sh"] + restart: always + networks: + - tubulinxyz_backend + logging: + driver: json-file + options: + max-size: "50m" + max-file: "3" + deploy: + resources: + limits: + memory: 4G + + backend: + image: ghcr.io/rtviii/tubulinxyz:0.2.1 + pull_policy: always + environment: + NEO4J_URI: bolt://neo4j:7687 + NEO4J_USER: neo4j + NEO4J_PASSWORD: ${NEO4J_PASSWORD} + SECRET_KEY: ${SECRET_KEY} + TUBXZ_ROOT: /app + TUBETL_DATA: /mnt/tubetl_data + NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite + volumes: + - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data + - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz:ro + depends_on: + neo4j: + condition: service_healthy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000/health"] + interval: 30s + timeout: 5s + retries: 3 + start_period: 15s + restart: always + networks: + - backend + - tubulinxyz_backend + stop_grace_period: 30s + logging: + driver: json-file + options: + max-size: "50m" + max-file: "5" + deploy: + resources: + limits: + memory: 2G + + scheduler: + image: ghcr.io/rtviii/tubulinxyz:0.2.1 + pull_policy: always + environment: + NEO4J_URI: bolt://neo4j:7687 + NEO4J_USER: neo4j + NEO4J_PASSWORD: ${NEO4J_PASSWORD} + TUBXZ_ROOT: /app + TUBETL_DATA: /mnt/tubetl_data + NCBI_TAXA_SQLITE: /app/.etetoolkit/taxa.sqlite + volumes: + - /mount/webhosting_dmz_write/tubulin/data:/mnt/tubetl_data + - /mount/webhosting_dmz_write/tubulin/log:/var/log/tubxz + depends_on: + neo4j: + condition: service_healthy + entrypoint: ["/bin/sh", "/app/scripts/start_scheduler.sh"] + restart: always + networks: + - tubulinxyz_backend + logging: + driver: json-file + options: + max-size: "50m" + max-file: "5" + deploy: + resources: + limits: + memory: 4G + + frontend: + image: ghcr.io/rtviii/tubulinxyz-frontend:0.2.0 + pull_policy: always + depends_on: + backend: + condition: service_healthy + restart: always + networks: + - backend + - tubulinxyz_backend + logging: + driver: json-file + options: + max-size: "50m" + max-file: "3" + deploy: + resources: + limits: + memory: 512M