Skip to content
Open
Changes from all commits
Commits
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
35 changes: 19 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
# you may need to add to this list if containers need to have internet access
# AND talk to other containers.
x-no-proxy: &no-proxy localhost

x-proxy-common: &proxy-common
HTTP_PROXY: ${HTTP_PROXY:-}
http_proxy: ${http_proxy:-}
HTTPS_PROXY: ${HTTPS_PROXY:-}
https_proxy: ${https_proxy:-}
NO_PROXY: *no-proxy
no_proxy: *no-proxy

services:
waveform-controller:
build:
context: ..
dockerfile: waveform-controller/Dockerfile
target: waveform_controller
args:
HTTP_PROXY: ${HTTP_PROXY}
http_proxy: ${http_proxy}
HTTPS_PROXY: ${HTTPS_PROXY}
https_proxy: ${https_proxy}
<<: *proxy-common
# ideally we'd use docker secrets but it's not enabled currently
env_file:
- ../config/controller.env
Expand All @@ -21,10 +30,7 @@ services:
dockerfile: waveform-controller/Dockerfile
target: waveform_exporter
args:
HTTP_PROXY: ${HTTP_PROXY}
http_proxy: ${http_proxy}
HTTPS_PROXY: ${HTTPS_PROXY}
https_proxy: ${https_proxy}
<<: *proxy-common
# Set to 1 in integration tests so COVERAGE_PROCESS_START can collect data.
# Default 0 keeps production/dev images free of the coverage package.
INSTALL_COVERAGE: ${INSTALL_COVERAGE:-0}
Expand All @@ -45,15 +51,15 @@ services:
target: hasher_api
args:
PIXL_PACKAGE_DIR: hasher
HTTP_PROXY: ${HTTP_PROXY}
http_proxy: ${http_proxy}
HTTPS_PROXY: ${HTTPS_PROXY}
https_proxy: ${https_proxy}
<<: *proxy-common
ports:
# this is only here as a convenience for testing, we don't actually use it from the exporter
- "127.0.0.1::8000"
env_file:
- ../config/hasher.env
environment:
# hasher needs access to key vaults at run time
<<: *proxy-common
restart: unless-stopped
waveform-monitoring:
# This service exists as a partly temporary measure, covering a few different cases:
Expand All @@ -65,10 +71,7 @@ services:
context: .
dockerfile: monitoring/Dockerfile
args:
HTTP_PROXY: ${HTTP_PROXY}
http_proxy: ${http_proxy}
HTTPS_PROXY: ${HTTPS_PROXY}
https_proxy: ${https_proxy}
<<: *proxy-common
env_file:
- ../config/monitoring.env
volumes:
Expand Down
Loading