From b324f8f9c712b8df335324f2e54c1935830b9f37 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Wed, 29 May 2024 13:09:58 -0600 Subject: [PATCH] Apply proxy settings from environment Signed-off-by: Nicolas Bock --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index be6df75..e8a5918 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,9 +24,9 @@ services: - ./athena-monitor-directories.yaml:/etc/athena/monitor-directories.yaml - ./tmp:/tmp/athena environment: - http_proxy: http://proxy.internal:3128 - https_proxy: http://proxy.internal:3128 - no_proxy: canonical--obiwan.sandbox.my.salesforce.com + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + no_proxy: ${no_proxy} command: /athena-monitor --config /etc/athena/main.yaml --config /etc/athena/monitor.yaml --config /etc/athena/monitor-directories.yaml --log.level=debug depends_on: - nats-streaming @@ -44,9 +44,9 @@ services: - ./athena-processor-upload.yaml:/etc/athena/processor-upload.yaml - ./tmp:/tmp/athena environment: - http_proxy: http://proxy.internal:3128 - https_proxy: http://proxy.internal:3128 - no_proxy: canonical--obiwan.sandbox.my.salesforce.com + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + no_proxy: ${no_proxy} command: /athena-processor --config /etc/athena/main.yaml --config /etc/athena/processor.yaml --config /etc/athena/processor-upload.yaml --log.level="debug" depends_on: - nats-streaming