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

♻️ Update docker service hostname #5379

Merged
merged 3 commits into from
Feb 27, 2024
Merged

♻️ Update docker service hostname #5379

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a62fb18
Update docker service hostname
YuryHrytsuk Feb 27, 2024
a882b8a
Merge branch 'master' into shorten-services-hostname
YuryHrytsuk Feb 27, 2024
66ceb5d
Docker service hostname: add task.slot
YuryHrytsuk Feb 27, 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
8 changes: 4 additions & 4 deletions services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG}
dns: 8.8.8.8 # needed to access internet from AWS
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
DASK_TLS_CA_FILE: ${DASK_TLS_CA_FILE}
DASK_TLS_CERT: ${DASK_TLS_CERT}
Expand Down Expand Up @@ -34,7 +34,7 @@ services:
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG}
dns: 8.8.8.8 # needed to access internet from AWS
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
hostname: "{{.Node.Hostname}}"
volumes:
- computational_shared_data:${SIDECAR_COMP_SERVICES_SHARED_FOLDER:-/home/scu/computational_shared_data}
- /var/run/docker.sock:/var/run/docker.sock:ro
Expand Down Expand Up @@ -72,7 +72,7 @@ services:
image: ${DOCKER_REGISTRY:-itisfoundation}/autoscaling:${DOCKER_IMAGE_TAG}
dns: 8.8.8.8 # needed to access internet from AWS
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
AUTOSCALING_EC2_ACCESS_KEY_ID: ${CLUSTERS_KEEPER_EC2_ACCESS_KEY_ID}
AUTOSCALING_EC2_ENDPOINT: ${CLUSTERS_KEEPER_EC2_ENDPOINT}
Expand Down Expand Up @@ -117,7 +117,7 @@ services:
image: "redis:6.2.6@sha256:4bed291aa5efb9f0d77b76ff7d4ab71eee410962965d052552db1fb80576431d"
dns: 8.8.8.8 # needed to access internet from AWS
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
interval: 5s
Expand Down
48 changes: 24 additions & 24 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
api-server:
image: ${DOCKER_REGISTRY:-itisfoundation}/api-server:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- API_SERVER_DEV_FEATURES_ENABLED=${API_SERVER_DEV_FEATURES_ENABLED}
- API_SERVER_DEV_HTTP_CALLS_LOGS_PATH=${API_SERVER_DEV_HTTP_CALLS_LOGS_PATH}
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
autoscaling:
image: ${DOCKER_REGISTRY:-itisfoundation}/autoscaling:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- autoscaling_subnet
environment:
Expand Down Expand Up @@ -127,7 +127,7 @@ services:
catalog:
image: ${DOCKER_REGISTRY:-itisfoundation}/catalog:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- CATALOG_BACKGROUND_TASK_REST_TIME=${CATALOG_BACKGROUND_TASK_REST_TIME:-60}
- CATALOG_DEV_FEATURES_ENABLED=${CATALOG_DEV_FEATURES_ENABLED}
Expand All @@ -149,7 +149,7 @@ services:
clusters-keeper:
image: ${DOCKER_REGISTRY:-itisfoundation}/clusters-keeper:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- default
environment:
Expand Down Expand Up @@ -198,7 +198,7 @@ services:
director:
image: ${DOCKER_REGISTRY:-itisfoundation}/director:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- DEFAULT_MAX_MEMORY=${DEFAULT_MAX_MEMORY:-0}
- DEFAULT_MAX_NANO_CPUS=${DEFAULT_MAX_NANO_CPUS:-0}
Expand Down Expand Up @@ -248,7 +248,7 @@ services:
director-v2:
image: ${DOCKER_REGISTRY:-itisfoundation}/director-v2:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- CATALOG_HOST=${CATALOG_HOST}
- CATALOG_PORT=${CATALOG_PORT}
Expand Down Expand Up @@ -336,7 +336,7 @@ services:
invitations:
image: ${DOCKER_REGISTRY:-itisfoundation}/invitations:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- default
environment:
Expand All @@ -352,7 +352,7 @@ services:
payments:
image: ${DOCKER_REGISTRY:-itisfoundation}/payments:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- default
environment:
Expand Down Expand Up @@ -390,7 +390,7 @@ services:
resource-usage-tracker:
image: ${DOCKER_REGISTRY:-itisfoundation}/resource-usage-tracker:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- default
environment:
Expand Down Expand Up @@ -425,7 +425,7 @@ services:
dynamic-schdlr:
image: ${DOCKER_REGISTRY:-itisfoundation}/dynamic-scheduler:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- default
environment:
Expand All @@ -444,7 +444,7 @@ services:
static-webserver:
image: ${DOCKER_REGISTRY:-itisfoundation}/static-webserver:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- SERVER_HOST=0.0.0.0
- SERVER_PORT=8000
Expand Down Expand Up @@ -496,7 +496,7 @@ services:
webserver:
image: ${DOCKER_REGISTRY:-itisfoundation}/webserver:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
AIODEBUG_SLOW_DURATION_SECS: ${AIODEBUG_SLOW_DURATION_SECS}

Expand Down Expand Up @@ -697,7 +697,7 @@ services:
wb-db-event-listener:
image: ${DOCKER_REGISTRY:-itisfoundation}/webserver:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}

Expand Down Expand Up @@ -781,7 +781,7 @@ services:
wb-garbage-collector:
image: ${DOCKER_REGISTRY:-itisfoundation}/webserver:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}

Expand Down Expand Up @@ -866,7 +866,7 @@ services:
agent:
image: ${DOCKER_REGISTRY:-itisfoundation}/agent:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
hostname: "{{.Node.Hostname}}"
deploy:
mode: global
resources:
Expand All @@ -892,7 +892,7 @@ services:
dask-sidecar:
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
hostname: "{{.Node.Hostname}}"
deploy:
mode: global
endpoint_mode: dnsrr
Expand All @@ -919,7 +919,7 @@ services:
dask-scheduler:
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
<<: *sidecar-environment
DASK_START_AS_SCHEDULER: 1
Expand All @@ -931,7 +931,7 @@ services:
datcore-adapter:
image: ${DOCKER_REGISTRY:-itisfoundation}/datcore-adapter:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
networks:
- storage_subnet
environment:
Expand All @@ -941,7 +941,7 @@ services:
storage:
image: ${DOCKER_REGISTRY:-itisfoundation}/storage:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- BF_API_KEY=${BF_API_KEY}
- BF_API_SECRET=${BF_API_SECRET}
Expand Down Expand Up @@ -969,7 +969,7 @@ services:
rabbit:
image: itisfoundation/rabbitmq:3.11.2-management
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- RABBITMQ_DEFAULT_USER=${RABBIT_USER}
- RABBITMQ_DEFAULT_PASS=${RABBIT_PASSWORD}
Expand All @@ -990,7 +990,7 @@ services:
migration:
image: ${DOCKER_REGISTRY:-itisfoundation}/migration:${DOCKER_IMAGE_TAG:-latest}
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- POSTGRES_DB=${POSTGRES_DB}
- POSTGRES_ENDPOINT=${POSTGRES_ENDPOINT}
Expand All @@ -1004,7 +1004,7 @@ services:
postgres:
image: "postgres:14.8-alpine@sha256:150dd39ccb7ae6c7ba6130c3582c39a30bb5d3d22cb08ad0ba37001e3f829abc"
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
environment:
- POSTGRES_DB=${POSTGRES_DB}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
Expand Down Expand Up @@ -1058,7 +1058,7 @@ services:
redis:
image: "redis:6.2.6@sha256:4bed291aa5efb9f0d77b76ff7d4ab71eee410962965d052552db1fb80576431d"
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
command:
# redis server will write a backup every 60 seconds if at least 1 key was changed
# also aof (append only) is also enabled such that we get full durability at the expense
Expand Down Expand Up @@ -1089,7 +1089,7 @@ services:
traefik:
image: "traefik:v2.9.8@sha256:553239e27c4614d0477651415205b9b119f7a98f698e6562ef383c9d8ff3b6e6"
init: true
hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
hostname: "{{.Node.Hostname}}"
command:
- "--api=true"
- "--api.dashboard=true"
Expand Down
Loading