Skip to content

Commit 9ead512

Browse files
committed
Revert "Add clearly identifyable container hostname"
This reverts commit 116e556.
1 parent 2933b0e commit 9ead512

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

services/docker-compose.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
api-server:
2525
image: ${DOCKER_REGISTRY:-itisfoundation}/api-server:${DOCKER_IMAGE_TAG:-latest}
2626
init: true
27-
hostname: "api-{{.Node.Hostname}}-{{.Task.Slot}}"
27+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
2828
environment:
2929
<<: *tracing_open_telemetry_environs
3030
API_SERVER_DEV_FEATURES_ENABLED: ${API_SERVER_DEV_FEATURES_ENABLED}
@@ -81,7 +81,7 @@ services:
8181
autoscaling:
8282
image: ${DOCKER_REGISTRY:-itisfoundation}/autoscaling:${DOCKER_IMAGE_TAG:-latest}
8383
init: true
84-
hostname: "as-{{.Node.Hostname}}-{{.Task.Slot}}"
84+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
8585
networks:
8686
- autoscaling_subnet
8787
environment:
@@ -193,7 +193,7 @@ services:
193193
clusters-keeper:
194194
image: ${DOCKER_REGISTRY:-itisfoundation}/clusters-keeper:${DOCKER_IMAGE_TAG:-latest}
195195
init: true
196-
hostname: "ck-{{.Node.Hostname}}-{{.Task.Slot}}"
196+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
197197
networks:
198198
- default
199199
environment:
@@ -261,7 +261,7 @@ services:
261261
director:
262262
image: ${DOCKER_REGISTRY:-itisfoundation}/director:${DOCKER_IMAGE_TAG:-latest}
263263
init: true
264-
hostname: "dv0-{{.Node.Hostname}}-{{.Task.Slot}}"
264+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
265265
environment:
266266
<<: *tracing_open_telemetry_environs
267267
DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY}
@@ -308,7 +308,7 @@ services:
308308
director-v2:
309309
image: ${DOCKER_REGISTRY:-itisfoundation}/director-v2:${DOCKER_IMAGE_TAG:-latest}
310310
init: true
311-
hostname: "dv2-{{.Node.Hostname}}-{{.Task.Slot}}"
311+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
312312
environment:
313313
<<: *tracing_open_telemetry_environs
314314
AWS_S3_CLI_S3: ${AWS_S3_CLI_S3}
@@ -418,7 +418,7 @@ services:
418418
efs-guardian:
419419
image: ${DOCKER_REGISTRY:-itisfoundation}/efs-guardian:${DOCKER_IMAGE_TAG:-latest}
420420
init: true
421-
hostname: "efs-{{.Node.Hostname}}-{{.Task.Slot}}"
421+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
422422
networks:
423423
- default
424424
environment:
@@ -521,7 +521,7 @@ services:
521521
resource-usage-tracker:
522522
image: ${DOCKER_REGISTRY:-itisfoundation}/resource-usage-tracker:${DOCKER_IMAGE_TAG:-latest}
523523
init: true
524-
hostname: "rut-{{.Node.Hostname}}-{{.Task.Slot}}"
524+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
525525
networks:
526526
- default
527527
environment:
@@ -560,7 +560,7 @@ services:
560560
dynamic-schdlr:
561561
image: ${DOCKER_REGISTRY:-itisfoundation}/dynamic-scheduler:${DOCKER_IMAGE_TAG:-latest}
562562
init: true
563-
hostname: "ds-{{.Node.Hostname}}-{{.Task.Slot}}"
563+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
564564
networks:
565565
- default
566566
- docker-api-network
@@ -627,7 +627,7 @@ services:
627627
static-webserver:
628628
image: ${DOCKER_REGISTRY:-itisfoundation}/static-webserver:${DOCKER_IMAGE_TAG:-latest}
629629
init: true
630-
hostname: "sw-{{.Node.Hostname}}-{{.Task.Slot}}"
630+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
631631
environment:
632632
SERVER_HOST: 0.0.0.0
633633
SERVER_PORT: 8000
@@ -1193,7 +1193,7 @@ services:
11931193
agent:
11941194
image: ${DOCKER_REGISTRY:-itisfoundation}/agent:${DOCKER_IMAGE_TAG:-latest}
11951195
init: true
1196-
hostname: "age-{{.Node.Hostname}}-{{.Task.Slot}}"
1196+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
11971197
deploy:
11981198
mode: global
11991199
resources:
@@ -1226,7 +1226,7 @@ services:
12261226
notifications:
12271227
image: ${DOCKER_REGISTRY:-itisfoundation}/notifications:${DOCKER_IMAGE_TAG:-latest}
12281228
init: true
1229-
hostname: "not-{{.Node.Hostname}}-{{.Task.Slot}}"
1229+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12301230

12311231
environment:
12321232
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
@@ -1253,7 +1253,7 @@ services:
12531253
dask-sidecar:
12541254
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
12551255
init: true
1256-
hostname: "dsid-{{.Node.Hostname}}-{{.Task.Slot}}"
1256+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12571257
deploy:
12581258
mode: global
12591259
endpoint_mode: dnsrr
@@ -1286,7 +1286,7 @@ services:
12861286
dask-scheduler:
12871287
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
12881288
init: true
1289-
hostname: "dask-{{.Node.Hostname}}-{{.Task.Slot}}"
1289+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12901290
environment:
12911291
<<: *sidecar-environment
12921292
DASK_START_AS_SCHEDULER: 1
@@ -1298,7 +1298,7 @@ services:
12981298
datcore-adapter:
12991299
image: ${DOCKER_REGISTRY:-itisfoundation}/datcore-adapter:${DOCKER_IMAGE_TAG:-latest}
13001300
init: true
1301-
hostname: "dat-{{.Node.Hostname}}-{{.Task.Slot}}"
1301+
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
13021302
networks:
13031303
- storage_subnet
13041304
environment:

0 commit comments

Comments
 (0)