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

Don't expose ports on all interfaces unless needed #387

Merged
merged 5 commits into from
May 2, 2024
Merged

Don't expose ports on all interfaces unless needed #387

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cea4cf9
Listen only on localhost for services that the CLI needs to talk to but
jeremyestein May 1, 2024
a72b5db
Ditto in the tests. No need to expose these externally.
jeremyestein May 1, 2024
d769c9e
Update docker-compose.yml
jeremyestein May 2, 2024
45cee8d
Postgres needs external access
jeremyestein May 2, 2024
9089b94
Merge branch 'main' into jeremy/localhost-only
jeremyestein May 2, 2024
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 @@ -94,7 +94,7 @@ services:
env_file:
- ./docker/common.env
ports:
- "${HASHER_API_PORT}:8000"
- "127.0.0.1:${HASHER_API_PORT}:8000"
volumes:
- *logs-volume
networks:
Expand Down Expand Up @@ -243,8 +243,8 @@ services:
timeout: 30s
retries: 3
ports:
- "${RABBITMQ_PORT}:5672"
- "${RABBITMQ_ADMIN_PORT}:15672"
- "127.0.0.1:${RABBITMQ_PORT}:5672"
- "127.0.0.1:${RABBITMQ_ADMIN_PORT}:15672"
jeremyestein marked this conversation as resolved.
Show resolved Hide resolved
networks:
- pixl-net
volumes:
Expand Down Expand Up @@ -281,7 +281,7 @@ services:
hasher-api:
condition: service_healthy
ports:
- "${PIXL_EXPORT_API_PORT}:8000"
- "127.0.0.1:${PIXL_EXPORT_API_PORT}:8000"
healthcheck:
interval: 10s
timeout: 30s
Expand Down Expand Up @@ -331,7 +331,7 @@ services:
PIXL_QUERY_TIMEOUT: ${PIXL_QUERY_TIMEOUT}
PIXL_MAX_MESSAGES_IN_FLIGHT: ${PIXL_MAX_MESSAGES_IN_FLIGHT}
ports:
- "${PIXL_IMAGING_API_PORT}:8000"
- "127.0.0.1:${PIXL_IMAGING_API_PORT}:8000"

################################################################################
# Data Stores
Expand All @@ -354,7 +354,7 @@ services:
source: postgres-data
target: /var/lib/postgresql/data
ports:
- "${POSTGRES_PORT}:5432"
- "127.0.0.1:${POSTGRES_PORT}:5432"
jeremyestein marked this conversation as resolved.
Show resolved Hide resolved
healthcheck:
test: ["CMD", "pg_isready", "-U", "${PIXL_DB_USER}"]
interval: 10s
Expand Down
12 changes: 6 additions & 6 deletions pixl_core/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ services:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
ports:
- "25672:5672"
- "35672:15672"
- "127.0.0.1:25672:5672"
- "127.0.0.1:35672:15672"
healthcheck:
test: rabbitmq-diagnostics -q check_running
interval: 10s
Expand All @@ -43,8 +43,8 @@ services:
RAW_IP_ADDR: "orthanc-raw" # aka. hostname
DICOM_WEB_PLUGIN_ENABLED: true
ports:
- "4243:4242"
- "8043:8042"
- "127.0.0.1:4243:4242"
- "127.0.0.1:8043:8042"
networks:
- pixl-test
healthcheck:
Expand All @@ -67,8 +67,8 @@ services:
RAW_IP_ADDR: "dicom-web" # aka. hostname
DICOM_WEB_PLUGIN_ENABLED: true
ports:
- "4244:4242"
- "8044:8042"
- "127.0.0.1:4244:4242"
- "127.0.0.1:8044:8042"
volumes:
- ../../test/dicomweb_config/:/run/secrets:ro
networks:
Expand Down
2 changes: 1 addition & 1 deletion pixl_export/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
POSTGRES_DB: pixl
PGTZ: Europe/London
ports:
- "35432:5432"
- "127.0.0.1:35432:5432"
env_file:
- ../../docker/common.env
command: postgres -c 'config_file=/etc/postgresql/postgresql.conf'
Expand Down
8 changes: 4 additions & 4 deletions pixl_imaging/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ services:
RAW_DICOM_PORT: "4242"
RAW_IP_ADDR: "orthanc-raw" # aka. hostname
ports:
- "4243:4242"
- "8043:8042"
- "127.0.0.1:4243:4242"
- "127.0.0.1:8043:8042"
volumes:
- ../../test/vna_config/:/run/secrets:ro

Expand All @@ -52,8 +52,8 @@ services:
ORTHANC_AUTOROUTE_RAW_TO_ANON: "false"
PROJECT_CONFIGS_DIR: "/projects/configs"
ports:
- "4244:4242"
- "8044:8042"
- "127.0.0.1:4244:4242"
- "127.0.0.1:8044:8042"
volumes:
# Overriding config for the test
- ./orthanc_raw_config/:/run/secrets:ro
8 changes: 4 additions & 4 deletions test/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ services:
RAW_DICOM_PORT: "4242"
RAW_IP_ADDR: "orthanc-raw" # aka. hostname
ports:
- "4243:4242"
- "8043:8042"
- "127.0.0.1:4243:4242"
- "127.0.0.1:8043:8042"
volumes:
- ./vna_config/:/run/secrets:ro
healthcheck:
Expand All @@ -55,8 +55,8 @@ services:
RAW_IP_ADDR: "dicomweb-server" # aka. hostname
DICOM_WEB_PLUGIN_ENABLED: true
ports:
- "4244:4242"
- "8044:8042"
- "127.0.0.1:4244:4242"
- "127.0.0.1:8044:8042"
volumes:
- ./dicomweb_config/:/run/secrets:ro
networks:
Expand Down