diff --git a/compose/python-pipeline.yml b/compose/python-pipeline.yml index 1e93088..5b2fd18 100644 --- a/compose/python-pipeline.yml +++ b/compose/python-pipeline.yml @@ -13,9 +13,7 @@ services: - PYTHON_STARTER_URL=${PYTHON_STARTER_URL:-http://python-starter:8080} - PYTHON_SCHEDULER_LOG_LEVEL=${PYTHON_SCHEDULER_LOG_LEVEL:-WARNING} - DELETE_LOG_DAYS=${DELETE_LOG_DAYS:-30} - #- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - # volumes: - # - "/opt/caddy/certs/cert.pem:/usr/local/share/ca-certificates/cert.crt" ### neccesary for self-signed certificates / .crt in PEM Format + - REQUESTS_CA_BUNDLE='/etc/ssl/certs/ca-certificates.crt' extra_hosts: - "host.docker.internal:host-gateway" networks: @@ -40,13 +38,12 @@ services: volumes: - "/var/run/docker.sock:/var/run/docker.sock" - "${PYTHON_TRANSFER_DIRECTORY_PATH:-/tmp}:${PYTHON_TRANSFER_DIRECTORY_PATH:-/tmp}" - #- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - # - "/opt/caddy/certs/cert.pem:/usr/local/share/ca-certificates/cert.crt" ### neccesary for self-signed certificates / .crt in PEM Format environment: - PYTHON_SCHEDULER_URL=${PYTHON_SCHEDULER_URL:-http://python-scheduler} - PYTHON_TRANSFER_DIRECTORY=${PYTHON_TRANSFER_DIRECTORY_PATH:-/tmp} - PYTHON_RUNNER_IMAGE=${PYTHON_RUNNER_IMAGE:-seatable/seatable-python-runner:3.1.0} - PYTHON_STARTER_LOG_LEVEL=${PYTHON_STARTER_LOG_LEVEL:-WARNING} + - REQUESTS_CA_BUNDLE='/etc/ssl/certs/ca-certificates.crt' networks: - backend-scheduler-net diff --git a/compose/seatable-server.yml b/compose/seatable-server.yml index 9b6bb78..427aff8 100644 --- a/compose/seatable-server.yml +++ b/compose/seatable-server.yml @@ -18,9 +18,9 @@ services: - SEATABLE_ADMIN_EMAIL=${SEATABLE_ADMIN_EMAIL:?Variable is not set or empty} - SEATABLE_ADMIN_PASSWORD=${SEATABLE_ADMIN_PASSWORD:?Variable is not set or empty} - TIME_ZONE=${TIME_ZONE} - #- REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - PYTHON_SCHEDULER_URL=${PYTHON_SCHEDULER_URL:-http://python-scheduler} - PYTHON_SCHEDULER_AUTH_TOKEN=${PYTHON_SCHEDULER_AUTH_TOKEN:-no_warning_define_in_env} + - REQUESTS_CA_BUNDLE='/etc/ssl/certs/ca-certificates.crt' labels: caddy: ${SEATABLE_SERVER_PROTOCOL:-https}://${SEATABLE_SERVER_HOSTNAME:?Variable is not set or empty} caddy.reverse_proxy: "{{upstreams 80}}"