Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply proxy settings from environment #152

Merged
merged 1 commit into from
May 29, 2024
Merged

Apply proxy settings from environment #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading