diff --git a/services/docker-compose.yml b/services/docker-compose.yml index b89d5b62e9f..3fc59041e97 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -6,18 +6,26 @@ x-dask-tls-secrets: &dask_tls_secrets target: ${DASK_TLS_CERT} # mode: 444 # not supported by docker stack compose as of 26.0.0 -x-tracing-open-telemetry: &tracing_open_telemetry_environs - TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT} - TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} - TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT} - TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY: ${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY} +## common environs + +x-common-logging: &common_logging_environments + LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} + LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} -x-webserver-diagnostics: &webserver_diagnostics_environs +x-webserver-diagnostics: &webserver_diagnostics_environments DIAGNOSTICS_HEALTHCHECK_ENABLED: ${DIAGNOSTICS_HEALTHCHECK_ENABLED} DIAGNOSTICS_MAX_AVG_LATENCY: ${DIAGNOSTICS_MAX_AVG_LATENCY} DIAGNOSTICS_MAX_TASK_DELAY: ${DIAGNOSTICS_MAX_TASK_DELAY} DIAGNOSTICS_SLOW_DURATION_SECS: ${DIAGNOSTICS_SLOW_DURATION_SECS} +x-tracing-open-telemetry: &tracing_open_telemetry_environments + TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT} + TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} + TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT} + TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY: ${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY} + + +## third-party party services x-postgres-settings: &postgres_settings POSTGRES_DB: ${POSTGRES_DB} POSTGRES_HOST: ${POSTGRES_HOST} @@ -29,6 +37,78 @@ x-postgres-settings: &postgres_settings POSTGRES_PORT: ${POSTGRES_PORT} POSTGRES_USER: ${POSTGRES_USER} +x-rabbit-settings: &rabbit_settings + RABBIT_HOST: ${RABBIT_HOST} + RABBIT_PASSWORD: ${RABBIT_PASSWORD} + RABBIT_PORT: ${RABBIT_PORT} + RABBIT_SECURE: ${RABBIT_SECURE} + RABBIT_USER: ${RABBIT_USER} + +x-redis-settings: &redis_settings + REDIS_HOST: ${REDIS_HOST} + REDIS_PORT: ${REDIS_PORT} + REDIS_SECURE: ${REDIS_SECURE} + REDIS_USER: ${REDIS_USER} + REDIS_PASSWORD: ${REDIS_PASSWORD} + +x-registry-settings: ®istry_settings + REGISTRY_AUTH: ${REGISTRY_AUTH} + REGISTRY_PATH: ${REGISTRY_PATH} + REGISTRY_PW: ${REGISTRY_PW} + REGISTRY_SSL: ${REGISTRY_SSL} + REGISTRY_URL: ${REGISTRY_URL} + REGISTRY_USER: ${REGISTRY_USER} + +x-s3-settings: &s3_settings + S3_ACCESS_KEY: ${S3_ACCESS_KEY} + S3_BUCKET_NAME: ${S3_BUCKET_NAME} + S3_ENDPOINT: ${S3_ENDPOINT} + S3_REGION: ${S3_REGION} + S3_SECRET_KEY: ${S3_SECRET_KEY} + + +x-smtp-settings: &smtp_settings + SMTP_HOST: ${SMTP_HOST} + SMTP_PORT: ${SMTP_PORT} + SMTP_USERNAME: ${SMTP_USERNAME} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_PROTOCOL: ${SMTP_PROTOCOL} + + +## simcore stack services + +x-catalog-settings: &catalog_settings + CATALOG_HOST: ${CATALOG_HOST} + CATALOG_PORT: ${CATALOG_PORT} + +x-director-v2-settings: &director_v2_settings + DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST} + DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT} + +x-storage-settings: &storage_settings + STORAGE_ENDPOINT: ${STORAGE_ENDPOINT} + STORAGE_HOST: ${STORAGE_HOST} + STORAGE_PORT: ${STORAGE_PORT} + +x-resource-usage-tracker-settings: &resource_usage_tracker_settings + RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST} + RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} + +x-payments-settings: &payments_settings + PAYMENTS_HOST: ${PAYMENTS_HOST} + PAYMENTS_PORT: ${PAYMENTS_PORT} + PAYMENTS_USERNAME: ${PAYMENTS_USERNAME} + PAYMENTS_PASSWORD: ${PAYMENTS_PASSWORD} + +x-invitations-settings: &invitations_settings + INVITATIONS_HOST: ${INVITATIONS_HOST} + INVITATIONS_PORT: ${INVITATIONS_PORT} + INVITATIONS_USERNAME: ${INVITATIONS_USERNAME} + INVITATIONS_PASSWORD: ${INVITATIONS_PASSWORD} + INVITATIONS_SECRET_KEY: ${INVITATIONS_SECRET_KEY} + INVITATIONS_OSPARC_URL: ${INVITATIONS_OSPARC_URL} + + services: api-server: image: ${DOCKER_REGISTRY:-itisfoundation}/api-server:${DOCKER_IMAGE_TAG:-latest} @@ -36,42 +116,27 @@ services: hostname: "{{.Node.Hostname}}-{{.Task.Slot}}" environment: &api_server_environment <<: - - *tracing_open_telemetry_environs + - *catalog_settings + - *director_v2_settings - *postgres_settings + - *rabbit_settings + - *redis_settings + - *storage_settings + - *tracing_open_telemetry_environments API_SERVER_DEV_FEATURES_ENABLED: ${API_SERVER_DEV_FEATURES_ENABLED} API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} API_SERVER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} + API_SERVER_TRACING: ${API_SERVER_TRACING} API_SERVER_LOGLEVEL: ${API_SERVER_LOGLEVEL} API_SERVER_PROFILING: ${API_SERVER_PROFILING} API_SERVER_WORKER_MODE: "false" - CATALOG_HOST: ${CATALOG_HOST} - CATALOG_PORT: ${CATALOG_PORT} - - DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST} - DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT} - - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} - - STORAGE_HOST: ${STORAGE_HOST} - STORAGE_PORT: ${STORAGE_PORT} - + # NOTE: points to wb-api server WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST} WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT} WEBSERVER_RPC_NAMESPACE: ${WB_API_WEBSERVER_HOST} WEBSERVER_SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY} - API_SERVER_TRACING: ${API_SERVER_TRACING} deploy: labels: @@ -114,7 +179,13 @@ services: networks: - autoscaling_subnet environment: - <<: *tracing_open_telemetry_environs + <<: + - *common_logging_environments + - *rabbit_settings + - *redis_settings + - *registry_settings + - *tracing_open_telemetry_environments + AUTOSCALING_LOGLEVEL: ${AUTOSCALING_LOGLEVEL} AUTOSCALING_POLL_INTERVAL: ${AUTOSCALING_POLL_INTERVAL} AUTOSCALING_DRAIN_NODES_WITH_LABELS: ${AUTOSCALING_DRAIN_NODES_WITH_LABELS} @@ -155,23 +226,6 @@ services: SSM_SECRET_ACCESS_KEY: ${SSM_SECRET_ACCESS_KEY} SSM_REGION_NAME: ${SSM_REGION_NAME} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - REDIS_HOST: ${REDIS_HOST} - REDIS_PASSWORD: ${REDIS_PASSWORD} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REGISTRY_USER: ${REGISTRY_USER} - REGISTRY_PW: ${REGISTRY_PW} - REGISTRY_URL: ${REGISTRY_URL} - REGISTRY_SSL: ${REGISTRY_SSL} - REGISTRY_AUTH: ${REGISTRY_AUTH} AUTOSCALING_TRACING: ${AUTOSCALING_TRACING} volumes: - "/var/run/docker.sock:/var/run/docker.sock" @@ -193,27 +247,24 @@ services: hostname: "cat-{{.Node.Hostname}}-{{.Task.Slot}}" environment: <<: + - *catalog_settings + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *tracing_open_telemetry_environments + CATALOG_BACKGROUND_TASK_REST_TIME: ${CATALOG_BACKGROUND_TASK_REST_TIME} CATALOG_DEV_FEATURES_ENABLED: ${CATALOG_DEV_FEATURES_ENABLED} CATALOG_LOGLEVEL: ${CATALOG_LOGLEVEL} CATALOG_PROFILING: ${CATALOG_PROFILING} CATALOG_SERVICES_DEFAULT_RESOURCES: ${CATALOG_SERVICES_DEFAULT_RESOURCES} CATALOG_SERVICES_DEFAULT_SPECIFICATIONS: ${CATALOG_SERVICES_DEFAULT_SPECIFICATIONS} + CATALOG_TRACING: ${CATALOG_TRACING} DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY} DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS} DIRECTOR_HOST: ${DIRECTOR_HOST:-director} DIRECTOR_PORT: ${DIRECTOR_PORT:-8080} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - CATALOG_TRACING: ${CATALOG_TRACING} + networks: - default @@ -224,7 +275,12 @@ services: networks: - default environment: - <<: *tracing_open_telemetry_environs + <<: + - *common_logging_environments + - *rabbit_settings + - *redis_settings + - *tracing_open_telemetry_environments + CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG: ${CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG} CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH: ${CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH} CLUSTERS_KEEPER_DASK_NPROCS: ${CLUSTERS_KEEPER_DASK_NPROCS} @@ -245,8 +301,6 @@ services: CLUSTERS_KEEPER_SSM_REGION_NAME: ${CLUSTERS_KEEPER_SSM_REGION_NAME} CLUSTERS_KEEPER_SSM_SECRET_ACCESS_KEY: ${CLUSTERS_KEEPER_SSM_SECRET_ACCESS_KEY} CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX: ${CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES: ${CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES} PRIMARY_EC2_INSTANCES_ALLOWED_TYPES: ${PRIMARY_EC2_INSTANCES_ALLOWED_TYPES} PRIMARY_EC2_INSTANCES_KEY_NAME: ${PRIMARY_EC2_INSTANCES_KEY_NAME} @@ -263,16 +317,6 @@ services: PRIMARY_EC2_INSTANCES_MAX_START_TIME: ${PRIMARY_EC2_INSTANCES_MAX_START_TIME} PRIMARY_EC2_INSTANCES_DOCKER_DEFAULT_ADDRESS_POOL: ${PRIMARY_EC2_INSTANCES_DOCKER_DEFAULT_ADDRESS_POOL} PRIMARY_EC2_INSTANCES_RABBIT: ${PRIMARY_EC2_INSTANCES_RABBIT} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} SWARM_STACK_NAME: ${SWARM_STACK_NAME} CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES: ${CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES} WORKERS_EC2_INSTANCES_ALLOWED_TYPES: ${WORKERS_EC2_INSTANCES_ALLOWED_TYPES} @@ -294,7 +338,9 @@ services: environment: <<: - *postgres_settings - - *tracing_open_telemetry_environs + - *registry_settings + - *tracing_open_telemetry_environments + DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY} DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS} DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: ${DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS} @@ -307,13 +353,6 @@ services: DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS: ${DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS} DIRECTOR_TRACING: ${DIRECTOR_TRACING} - REGISTRY_AUTH: ${REGISTRY_AUTH} - REGISTRY_PATH: ${REGISTRY_PATH} - REGISTRY_PW: ${REGISTRY_PW} - REGISTRY_SSL: ${REGISTRY_SSL} - REGISTRY_URL: ${REGISTRY_URL} - REGISTRY_USER: ${REGISTRY_USER} - SIMCORE_SERVICES_NETWORK_NAME: interactive_services_subnet STORAGE_ENDPOINT: ${STORAGE_ENDPOINT} SWARM_STACK_NAME: ${SWARM_STACK_NAME} @@ -336,8 +375,13 @@ services: hostname: "{{.Node.Hostname}}-{{.Task.Slot}}" environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *redis_settings + - *registry_settings + - *s3_settings + - *tracing_open_telemetry_environments AWS_S3_CLI_S3: ${AWS_S3_CLI_S3} CATALOG_HOST: ${CATALOG_HOST} @@ -369,8 +413,6 @@ services: DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS: ${DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS} DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: ${DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} DIRECTOR_V2_LOGLEVEL: ${DIRECTOR_V2_LOGLEVEL} MONITORING_ENABLED: ${MONITORING_ENABLED} @@ -383,34 +425,11 @@ services: EFS_MOUNTED_PATH: ${EFS_MOUNTED_PATH} EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: ${EFS_PROJECT_SPECIFIC_DATA_DIRECTORY} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} - - REGISTRY_AUTH: ${REGISTRY_AUTH} - REGISTRY_PATH: ${REGISTRY_PATH} - REGISTRY_PW: ${REGISTRY_PW} - REGISTRY_SSL: ${REGISTRY_SSL} - REGISTRY_URL: ${REGISTRY_URL} - REGISTRY_USER: ${REGISTRY_USER} DIRECTOR_V2_DOCKER_HUB_REGISTRY: ${DIRECTOR_V2_DOCKER_HUB_REGISTRY} RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST} RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_BUCKET_NAME: ${S3_BUCKET_NAME} - S3_ENDPOINT: ${S3_ENDPOINT} - S3_REGION: ${S3_REGION} - S3_SECRET_KEY: ${S3_SECRET_KEY} STORAGE_HOST: ${STORAGE_HOST} STORAGE_PORT: ${STORAGE_PORT} @@ -446,20 +465,11 @@ services: - default environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - REDIS_HOST: ${REDIS_HOST} - REDIS_PASSWORD: ${REDIS_PASSWORD} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} + - *rabbit_settings + - *redis_settings + - *tracing_open_telemetry_environments SC_USER_ID: ${SC_USER_ID} SC_USER_NAME: ${SC_USER_NAME} EFS_USER_ID: ${EFS_USER_ID} @@ -479,7 +489,9 @@ services: networks: - default environment: - <<: *tracing_open_telemetry_environs + <<: + - *common_logging_environments + - *tracing_open_telemetry_environments INVITATIONS_DEFAULT_PRODUCT: ${INVITATIONS_DEFAULT_PRODUCT} INVITATIONS_LOGLEVEL: ${INVITATIONS_LOGLEVEL} INVITATIONS_OSPARC_URL: ${INVITATIONS_OSPARC_URL} @@ -488,8 +500,6 @@ services: INVITATIONS_SWAGGER_API_DOC_ENABLED: ${INVITATIONS_SWAGGER_API_DOC_ENABLED} INVITATIONS_TRACING: ${INVITATIONS_TRACING} INVITATIONS_USERNAME: ${INVITATIONS_USERNAME} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} payments: image: ${DOCKER_REGISTRY:-itisfoundation}/payments:${DOCKER_IMAGE_TAG:-latest} @@ -499,11 +509,13 @@ services: - default environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *resource_usage_tracker_settings + - *smtp_settings + - *tracing_open_telemetry_environments - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES: ${PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES} PAYMENTS_ACCESS_TOKEN_SECRET_KEY: ${PAYMENTS_ACCESS_TOKEN_SECRET_KEY} PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT: ${PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT} @@ -521,19 +533,6 @@ services: PAYMENTS_SWAGGER_API_DOC_ENABLED: ${PAYMENTS_SWAGGER_API_DOC_ENABLED} PAYMENTS_TRACING: ${PAYMENTS_TRACING} PAYMENTS_USERNAME: ${PAYMENTS_USERNAME} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST} - RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} - SMTP_HOST: ${SMTP_HOST} - SMTP_PASSWORD: ${SMTP_PASSWORD} - SMTP_PORT: ${SMTP_PORT} - SMTP_PROTOCOL: ${SMTP_PROTOCOL} - SMTP_USERNAME: ${SMTP_USERNAME} - resource-usage-tracker: image: ${DOCKER_REGISTRY:-itisfoundation}/resource-usage-tracker:${DOCKER_IMAGE_TAG:-latest} @@ -543,25 +542,15 @@ services: - default environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs - - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} + - *rabbit_settings + - *redis_settings + - *tracing_open_telemetry_environments PROMETHEUS_URL: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_URL} PROMETHEUS_USERNAME: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_USERNAME} PROMETHEUS_PASSWORD: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_PASSWORD} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} RESOURCE_USAGE_TRACKER_LOGLEVEL: ${RESOURCE_USAGE_TRACKER_LOGLEVEL} RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED} RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC} @@ -580,8 +569,11 @@ services: - docker-api-network environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *redis_settings + - *tracing_open_telemetry_environments CATALOG_HOST: ${CATALOG_HOST} CATALOG_PORT: ${CATALOG_PORT} @@ -602,20 +594,6 @@ services: DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER: ${DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER} DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: ${DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - - REDIS_HOST: ${REDIS_HOST} - REDIS_PASSWORD: ${REDIS_PASSWORD} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} docker-api-proxy: @@ -693,9 +671,18 @@ services: hostname: "wb-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931 environment: &webserver_environment <<: + - *catalog_settings + - *director_v2_settings + - *invitations_settings + - *payments_settings - *postgres_settings - - *tracing_open_telemetry_environs - - *webserver_diagnostics_environs + - *rabbit_settings + - *redis_settings + - *resource_usage_tracker_settings + - *smtp_settings + - *storage_settings + - *tracing_open_telemetry_environments + - *webserver_diagnostics_environments AIODEBUG_SLOW_DURATION_SECS: ${AIODEBUG_SLOW_DURATION_SECS} @@ -703,7 +690,6 @@ services: WEBSERVER_DEV_FEATURES_ENABLED: ${WEBSERVER_DEV_FEATURES_ENABLED} WEBSERVER_REALTIME_COLLABORATION: ${WEBSERVER_REALTIME_COLLABORATION} - WEBSERVER_LOGLEVEL: ${WEBSERVER_LOGLEVEL} WEBSERVER_PROFILING: ${WEBSERVER_PROFILING} @@ -727,8 +713,6 @@ services: PROMETHEUS_URL: ${WEBSERVER_PROMETHEUS_URL} WEBSERVER_CATALOG: ${WEBSERVER_CATALOG} - CATALOG_HOST: ${CATALOG_HOST} - CATALOG_PORT: ${CATALOG_PORT} # WEBSERVER_CREDIT_COMPUTATION WEBSERVER_CREDIT_COMPUTATION_ENABLED: ${WEBSERVER_CREDIT_COMPUTATION_ENABLED} @@ -737,16 +721,9 @@ services: WEBSERVER_DIAGNOSTICS: ${WEBSERVER_DIAGNOSTICS} # WEBSERVER_DIRECTOR_V2 - DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST} - DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT} # WEBSERVER_EMAIL WEBSERVER_EMAIL: ${WEBSERVER_EMAIL} - SMTP_HOST: ${SMTP_HOST} - SMTP_PORT: ${SMTP_PORT} - SMTP_USERNAME: ${SMTP_USERNAME} - SMTP_PASSWORD: ${SMTP_PASSWORD} - SMTP_PROTOCOL: ${SMTP_PROTOCOL} WEBSERVER_EXPORTER: ${WEBSERVER_EXPORTER} @@ -754,13 +731,8 @@ services: WEBSERVER_GARBAGE_COLLECTOR: ${WEBSERVER_GARBAGE_COLLECTOR} # WEBSERVER_INVITATIONS - INVITATIONS_HOST: ${INVITATIONS_HOST} INVITATIONS_LOGLEVEL: ${INVITATIONS_LOGLEVEL} INVITATIONS_OSPARC_URL: ${INVITATIONS_OSPARC_URL} - INVITATIONS_PASSWORD: ${INVITATIONS_PASSWORD} - INVITATIONS_PORT: ${INVITATIONS_PORT} - INVITATIONS_SECRET_KEY: ${INVITATIONS_SECRET_KEY} - INVITATIONS_USERNAME: ${INVITATIONS_USERNAME} WEBSERVER_LICENSES: ${WEBSERVER_LICENSES} WEBSERVER_FOGBUGZ: ${WEBSERVER_FOGBUGZ} @@ -788,17 +760,6 @@ services: PAYMENTS_FAKE_COMPLETION_DELAY_SEC: ${PAYMENTS_FAKE_COMPLETION_DELAY_SEC} PAYMENTS_FAKE_COMPLETION: ${PAYMENTS_FAKE_COMPLETION} PAYMENTS_FAKE_GATEWAY_URL: ${PAYMENTS_GATEWAY_URL} - PAYMENTS_HOST: ${PAYMENTS_HOST} - PAYMENTS_PASSWORD: ${PAYMENTS_PASSWORD} - PAYMENTS_PORT: ${PAYMENTS_PORT} - PAYMENTS_USERNAME: ${PAYMENTS_USERNAME} - - # WEBSERVER_REDIS - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} # WEBSERVER_REST REST_SWAGGER_API_DOC_ENABLED: ${REST_SWAGGER_API_DOC_ENABLED} @@ -807,8 +768,6 @@ services: RESOURCE_MANAGER_RESOURCE_TTL_S: ${RESOURCE_MANAGER_RESOURCE_TTL_S} # WEBSERVER_RESOURCE_USAGE_TRACKER - RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST} - RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} # WEBSERVER_SCICRUNCH WEBSERVER_SCICRUNCH: ${WEBSERVER_SCICRUNCH} @@ -827,9 +786,6 @@ services: SIMCORE_VCS_RELEASE_TAG: ${SIMCORE_VCS_RELEASE_TAG} # WEBSERVER_STORAGE - STORAGE_ENDPOINT: ${STORAGE_ENDPOINT} - STORAGE_HOST: ${STORAGE_HOST} - STORAGE_PORT: ${STORAGE_PORT} # WEBSERVER_STUDIES_DISPATCHER WEBSERVER_STUDIES_DISPATCHER: ${WEBSERVER_STUDIES_DISPATCHER} @@ -844,13 +800,6 @@ services: PROJECTS_MAX_COPY_SIZE_BYTES: ${PROJECTS_MAX_COPY_SIZE_BYTES} PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES: ${PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES} - # WEBSERVER_RABBITMQ - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - # WEBSERVER_TRASH TRASH_RETENTION_DAYS: ${TRASH_RETENTION_DAYS} @@ -945,7 +894,11 @@ services: hostname: "db-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931 environment: <<: + - *common_logging_environments - *postgres_settings + - *rabbit_settings + - *redis_settings + WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL} # NOTE: keep in sync with the prefix form the hostname @@ -965,8 +918,6 @@ services: RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} SWARM_STACK_NAME: ${SWARM_STACK_NAME} SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY} WEBSERVER_ACTIVITY: ${WB_DB_EL_ACTIVITY} @@ -1001,19 +952,6 @@ services: WEBSERVER_USERS: ${WB_DB_EL_USERS} WEBSERVER_WALLETS: ${WB_DB_EL_WALLETS} - # WEBSERVER_RABBITMQ - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - - # WEBSERVER_REDIS - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} RESOURCE_MANAGER_RESOURCE_TTL_S: ${RESOURCE_MANAGER_RESOURCE_TTL_S} @@ -1031,41 +969,27 @@ services: hostname: "gc-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931 environment: <<: + - *common_logging_environments + - *director_v2_settings - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *redis_settings + - *storage_settings + - *resource_usage_tracker_settings + - *tracing_open_telemetry_environments # WEBSERVER_DIRECTOR_V2 - DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST} - DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT} GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} # NOTE: keep in sync with the prefix form the hostname LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: gc - # WEBSERVER_RABBITMQ - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - - # WEBSERVER_REDIS - REDIS_HOST: ${REDIS_HOST} - REDIS_PASSWORD: ${REDIS_PASSWORD} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - # WEBSERVER_RESOURCE_MANAGER RESOURCE_MANAGER_RESOURCE_TTL_S: ${WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S} # WEBSERVER_RESOURCE_USAGE_TRACKER - RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST} - RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT} REST_SWAGGER_API_DOC_ENABLED: ${WB_GC_REST_SWAGGER_API_DOC_ENABLED} @@ -1073,8 +997,6 @@ services: SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY} # WEBSERVER_STORAGE - STORAGE_HOST: ${STORAGE_HOST} - STORAGE_PORT: ${STORAGE_PORT} SWARM_STACK_NAME: ${SWARM_STACK_NAME} @@ -1127,8 +1049,8 @@ services: environment: <<: - *postgres_settings - - *tracing_open_telemetry_environs - - *webserver_diagnostics_environs + - *tracing_open_telemetry_environments + - *webserver_diagnostics_environments APP_NAME: "simcore_service_wb_auth" WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY @@ -1139,7 +1061,6 @@ services: GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS} - # WEBSERVER_DIAGNOSTICS WEBSERVER_DIAGNOSTICS: ${WB_AUTH_DIAGNOSTICS} @@ -1211,9 +1132,12 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: + <<: + - *common_logging_environments + - *rabbit_settings + - *tracing_open_telemetry_environments + AGENT_LOGLEVEL: ${AGENT_LOGLEVEL} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: ${AGENT_VOLUMES_CLEANUP_S3_ENDPOINT} AGENT_VOLUMES_CLEANUP_S3_REGION: ${AGENT_VOLUMES_CLEANUP_S3_REGION} AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY: ${AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY} @@ -1221,14 +1145,7 @@ services: AGENT_VOLUMES_CLEANUP_S3_BUCKET: ${AGENT_VOLUMES_CLEANUP_S3_BUCKET} AGENT_VOLUMES_CLEANUP_S3_PROVIDER: ${AGENT_VOLUMES_CLEANUP_S3_PROVIDER} AGENT_DOCKER_NODE_ID: "{{.Node.ID}}" - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_USER: ${RABBIT_USER} - RABBIT_SECURE: ${RABBIT_SECURE} - AGENT_TRACING: ${AGENT_TRACING} - <<: *tracing_open_telemetry_environs notifications: image: ${DOCKER_REGISTRY:-itisfoundation}/notifications:${DOCKER_IMAGE_TAG:-latest} @@ -1237,20 +1154,14 @@ services: environment: <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} + - *rabbit_settings + - *tracing_open_telemetry_environments NOTIFICATIONS_LOGLEVEL: ${NOTIFICATIONS_LOGLEVEL} NOTIFICATIONS_TRACING: ${NOTIFICATIONS_TRACING} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - dask-sidecar: image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest} init: true @@ -1266,6 +1177,9 @@ services: - computational_shared_data:${SIDECAR_COMP_SERVICES_SHARED_FOLDER:-/home/scu/computational_shared_data} - /var/run/docker.sock:/var/run/docker.sock environment: &sidecar-environment + <<: + - *rabbit_settings + DASK_TLS_CA_FILE: ${DASK_TLS_CA_FILE} DASK_TLS_KEY: ${DASK_TLS_KEY} DASK_TLS_CERT: ${DASK_TLS_CERT} @@ -1275,11 +1189,6 @@ services: DASK_SIDECAR_LOGLEVEL: ${DASK_SIDECAR_LOGLEVEL} SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME: ${SWARM_STACK_NAME}_computational_shared_data SIDECAR_COMP_SERVICES_SHARED_FOLDER: ${SIDECAR_COMP_SERVICES_SHARED_FOLDER:-/home/scu/computational_shared_data} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} networks: - computational_services_subnet secrets: *dask_tls_secrets @@ -1303,10 +1212,13 @@ services: networks: - storage_subnet environment: + <<: + - *tracing_open_telemetry_environments + DATCORE_ADAPTER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} DATCORE_ADAPTER_TRACING: ${DATCORE_ADAPTER_TRACING} - <<: *tracing_open_telemetry_environs + storage: image: ${DOCKER_REGISTRY:-itisfoundation}/storage:${DOCKER_IMAGE_TAG:-latest} @@ -1314,26 +1226,13 @@ services: hostname: "sto-{{.Node.Hostname}}-{{.Task.Slot}}" environment: &storage_environment <<: + - *common_logging_environments - *postgres_settings - - *tracing_open_telemetry_environs + - *rabbit_settings + - *redis_settings + - *s3_settings + - *tracing_open_telemetry_environments DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter} - LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} - LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} - RABBIT_HOST: ${RABBIT_HOST} - RABBIT_PASSWORD: ${RABBIT_PASSWORD} - RABBIT_PORT: ${RABBIT_PORT} - RABBIT_SECURE: ${RABBIT_SECURE} - RABBIT_USER: ${RABBIT_USER} - REDIS_HOST: ${REDIS_HOST} - REDIS_PORT: ${REDIS_PORT} - REDIS_SECURE: ${REDIS_SECURE} - REDIS_USER: ${REDIS_USER} - REDIS_PASSWORD: ${REDIS_PASSWORD} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_BUCKET_NAME: ${S3_BUCKET_NAME} - S3_ENDPOINT: ${S3_ENDPOINT} - S3_REGION: ${S3_REGION} - S3_SECRET_KEY: ${S3_SECRET_KEY} STORAGE_WORKER_MODE: "false" STORAGE_LOGLEVEL: ${STORAGE_LOGLEVEL} STORAGE_MONITORING_ENABLED: 1