Skip to content

Commit 5535de7

Browse files
HankHerr-NOAAHankHerr-NOAA
authored
Merge pull request #317 from NOAA-OWP/6.26-docker
Compose files for release 6.26, #312
2 parents 80977b3 + 1e8e2bf commit 5535de7

File tree

2 files changed

+94
-14
lines changed

2 files changed

+94
-14
lines changed

‎compose-entry.yml

+54-9
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,39 @@ volumes:
1515
o: "ro,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,timeo=600,retrans=2,sec=sys,local_lock=none,addr=${NFS_HOME_DIR_IP_ADDRESS}"
1616
device: "${NFS_HOME_DIR_DEVICE}"
1717
services:
18+
nginx:
19+
image: "${DOCKER_REGISTRY}/wres/nginx"
20+
container_name: nginx_proxy
21+
volumes:
22+
- ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
23+
- ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
24+
depends_on:
25+
- cadvisor
26+
ports:
27+
- 9999:9999
28+
networks:
29+
wres_net:
30+
cadvisor:
31+
image: gcr.io/cadvisor/cadvisor:latest
32+
container_name: cadvisor
33+
ports:
34+
- 8080:8080
35+
volumes:
36+
- /:/rootfs:ro
37+
- /var/run:/var/run:rw
38+
- /sys:/sys:ro
39+
- /var/lib/docker/:/var/lib/docker:ro
40+
- /cgroup:/cgroup:ro
41+
- /dev/disk:/dev/disk/:ro
42+
command:
43+
- --disable_metrics=network
44+
- --docker_only=true
45+
depends_on:
46+
- worker
47+
networks:
48+
wres_net:
1849
persister:
19-
image: "${DOCKER_REGISTRY}/wres/wres-redis:20240821-1d5b305"
50+
image: "${DOCKER_REGISTRY}/wres/wres-redis:20240913-80977b3"
2051
restart: always
2152
volumes:
2253
# For the job data
@@ -33,7 +64,7 @@ services:
3364
tasker:
3465
ports:
3566
- "443:8443"
36-
image: "${DOCKER_REGISTRY}/wres/wres-tasker:20240821-1d5b305"
67+
image: "${DOCKER_REGISTRY}/wres/wres-tasker:20240913-80977b3"
3768
restart: always
3869
depends_on:
3970
broker:
@@ -53,7 +84,7 @@ services:
5384
- /mnt/wres_share/logs/tasker/:/mnt/wres_share/logs/tasker/
5485
environment:
5586
# Make sure to pass through WRES_TASKER_SERVER_P12 to tasker at runtime
56-
- JAVA_OPTS=-Dwres.monitorPassword=${WRES_MONITOR_PASSWORD} -Dwres.adminToken=${WRES_ADMIN_TOKEN} -Dwres.broker=broker -Dwres.redisHost=persister -Dwres.trustStore=${WRES_TRUST_STORE} -Dwres.taskerPathToServerP12=${WRES_TASKER_SERVER_P12} -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/input_data -Dwres.dataDirectDiskThreshold=90 -Dwres.numberOfWorkers=5 -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/tasker -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/tasker/java_pid%p.hprof /mnt/wres_share/heap_dumps/tasker/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/tasker/java_pid%p_$$CON_HOSTNAME.hprof'
87+
- JAVA_OPTS=-Dwres.monitorPassword=${WRES_MONITOR_PASSWORD} -Dwres.adminToken=${WRES_ADMIN_TOKEN} -Dwres.broker=broker -Dwres.redisHost=persister -Dwres.trustStore=${WRES_TRUST_STORE} -Dwres.trustStorePassword=${WRES_TRUST_STORE_PASSWORD} -Dwres.taskerPathToServerP12=${WRES_TASKER_SERVER_P12} -Dwres.taskerPathToServerP12Password=${WRES_TASKER_SERVER_P12_PASSWORD} -Dwres.taskerPathToClientP12Bundle=${WRES_TASKER_CLIENT_P12} -Dwres.taskerPathToClientP12Password=${WRES_TASKER_CLIENT_P12_PASSWORD} -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/input_data -Dwres.dataDirectDiskThreshold=90 -Dwres.numberOfWorkers=5 -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/tasker -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/tasker/java_pid%p.hprof /mnt/wres_share/heap_dumps/tasker/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/tasker/java_pid%p_$$CON_HOSTNAME.hprof'
5788
- LANG=C.UTF-8
5889
# Tasker JVM should have 340m max heap specified at launch
5990
# The total limit includes stack space which depends on Thread count
@@ -68,7 +99,8 @@ services:
6899
ports:
69100
- "5671:5671"
70101
- "15671:15671"
71-
image: "${DOCKER_REGISTRY}/wres/wres-broker:20240821-1d5b305"
102+
- "15691:15691"
103+
image: "${DOCKER_REGISTRY}/wres/wres-broker:20240913-80977b3"
72104
restart: always
73105
volumes:
74106
# For certificates and keys that correspond to them:
@@ -77,6 +109,15 @@ services:
77109
- /mnt/wres_share/rabbitmq/:/var/lib/rabbitmq/
78110
environment:
79111
- RABBITMQ_CONFIG_FILE=rabbitmq.conf
112+
- WRES_RABBITMQ_SSL_OPTIONS_CACERTFILE=${WRES_RABBITMQ_SSL_OPTIONS_CACERTFILE}
113+
- WRES_RABBITMQ_SSL_OPTIONS_CERTFILE=${WRES_RABBITMQ_SSL_OPTIONS_CERTFILE}
114+
- WRES_RABBITMQ_SSL_OPTIONS_KEYFILE=${WRES_RABBITMQ_SSL_OPTIONS_KEYFILE}
115+
- WRES_RABBITMQ_MANAGEMENT_SSL_CACERTFILE=${WRES_RABBITMQ_MANAGEMENT_SSL_CACERTFILE}
116+
- WRES_RABBITMQ_MANAGEMENT_SSL_CERTFILE=${WRES_RABBITMQ_MANAGEMENT_SSL_CERTFILE}
117+
- WRES_RABBITMQ_MANAGEMENT_SSL_KEYFILE=${WRES_RABBITMQ_MANAGEMENT_SSL_KEYFILE}
118+
- WRES_RABBITMQ_PROMETHEUS_SSL_CACERTFILE=${WRES_RABBITMQ_PROMETHEUS_SSL_CACERTFILE}
119+
- WRES_RABBITMQ_PROMETHEUS_SSL_CERTFILE=${WRES_RABBITMQ_PROMETHEUS_SSL_CERTFILE}
120+
- WRES_RABBITMQ_PROMETHEUS_SSL_KEYFILE=${WRES_RABBITMQ_PROMETHEUS_SSL_KEYFILE}
80121
# rabbitmq.conf should have 360m specified as high watermark
81122
mem_limit: 720m
82123
cap_drop:
@@ -87,7 +128,7 @@ services:
87128
healthcheck:
88129
start_period: 5m
89130
worker:
90-
image: "${DOCKER_REGISTRY}/wres/wres-worker:20240821-1d5b305"
131+
image: "${DOCKER_REGISTRY}/wres/wres-worker:20240913-80977b3"
91132
restart: always
92133
depends_on:
93134
broker:
@@ -114,7 +155,7 @@ services:
114155
# Writing all log outputs:
115156
- /mnt/wres_share/logs/worker/:/mnt/wres_share/logs/worker/
116157
environment:
117-
- JAVA_OPTS=-Dwres.broker=broker -Dcom.redhat.fips=false -Dwres.trustStore=${WRES_TRUST_STORE} -Djava.io.tmpdir=/mnt/wres_share/evaluations -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/worker-shim -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/worker-shim/java_pid%p.hprof /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof'
158+
- JAVA_OPTS=-Dwres.broker=broker -Dcom.redhat.fips=false -Dwres.trustStore=${WRES_TRUST_STORE} -Dwres.trustStorePassword=${WRES_TRUST_STORE_PASSWORD} -Dwres.workerPathToClientP12Bundle=${WRES_WORKER_CLIENT_P12} -Dwres.workerPathToClientP12Password=${WRES_WORKER_CLIENT_P12_PASSWORD} -Djava.io.tmpdir=/mnt/wres_share/evaluations -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/worker-shim -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/worker-shim/java_pid%p.hprof /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof'
118159
- PGPASSFILE=/wres_secrets/.pgpass
119160
# Use caller-specified db hostname from env var WRES_DB_FQDN.
120161
# Do not auto-liquibase-migrate on each evaluation. This requires an
@@ -137,7 +178,7 @@ services:
137178
- 5673
138179
ports:
139180
- 15673:15673
140-
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240821-1d5b305"
181+
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240913-80977b3"
141182
restart: always
142183
volumes:
143184
# For heap-dump files
@@ -146,6 +187,10 @@ services:
146187
- /mnt/wres_keys:/wres_secrets:ro
147188
environment:
148189
- BROKER_WORK=/container_home
190+
- BROKER_KEYSTORE_PATH=${EVENTSBROKER_KEYSTORE_PATH}
191+
- BROKER_KEYSTORE_PASSWORD=${EVENTSBROKER_KEYSTORE_PASSWORD}
192+
- BROKER_TRUSTSTORE_PATH=${EVENTSBROKER_TRUSTSTORE_PATH}
193+
- BROKER_TRUSTSTORE_PASSWORD=${EVENTSBROKER_TRUSTSTORE_PASSWORD}
149194
- JAVA_ARGS=-XX:+PrintClassHistogram -XX:+UseG1GC -XX:+UseStringDeduplication -Xms2048m -Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/eventsbroker -Dcom.redhat.fips=false
150195
- LANG=C.UTF-8
151196
# Broker heap is 2048m in JAVA_ARGS
@@ -159,7 +204,7 @@ services:
159204
depends_on:
160205
eventsbroker:
161206
condition: service_started
162-
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240821-1d5b305"
207+
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240913-80977b3"
163208
restart: always
164209
volumes:
165210
# To write graphics outputs
@@ -181,7 +226,7 @@ services:
181226
depends_on:
182227
eventsbroker:
183228
condition: service_started
184-
image: "${DOCKER_REGISTRY}/wres/wres-writing:20240821-1d5b305"
229+
image: "${DOCKER_REGISTRY}/wres/wres-writing:20240913-80977b3"
185230
restart: always
186231
volumes:
187232
# To write numeric outputs

‎compose-workers.yml

+40-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,39 @@ volumes:
1515
o: "ro,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,timeo=600,retrans=2,sec=sys,local_lock=none,addr=${NFS_HOME_DIR_IP_ADDRESS}"
1616
device: "${NFS_HOME_DIR_DEVICE}"
1717
services:
18+
nginx:
19+
image: "${DOCKER_REGISTRY}/wres/nginx"
20+
container_name: nginx_proxy
21+
volumes:
22+
- ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
23+
- ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
24+
depends_on:
25+
- cadvisor
26+
ports:
27+
- 9999:9999
28+
networks:
29+
wres_net:
30+
cadvisor:
31+
image: gcr.io/cadvisor/cadvisor:latest
32+
container_name: cadvisor
33+
ports:
34+
- 8080:8080
35+
volumes:
36+
- /:/rootfs:ro
37+
- /var/run:/var/run:rw
38+
- /sys:/sys:ro
39+
- /var/lib/docker/:/var/lib/docker:ro
40+
- /cgroup:/cgroup:ro
41+
- /dev/disk:/dev/disk/:ro
42+
command:
43+
- --disable_metrics=network
44+
- --docker_only=true
45+
depends_on:
46+
- worker
47+
networks:
48+
wres_net:
1849
worker:
19-
image: "${DOCKER_REGISTRY}/wres/wres-worker:20240821-1d5b305"
50+
image: "${DOCKER_REGISTRY}/wres/wres-worker:20240913-80977b3"
2051
restart: always
2152
depends_on:
2253
eventsbroker:
@@ -41,7 +72,7 @@ services:
4172
# Writing all log outputs:
4273
- /mnt/wres_share/logs/worker/:/mnt/wres_share/logs/worker/
4374
environment:
44-
- JAVA_OPTS=-Dwres.broker=${WRES_BROKER_HOST} -Dcom.redhat.fips=false -Dwres.trustStore=${WRES_TRUST_STORE} -Djava.io.tmpdir=/mnt/wres_share/evaluations -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/worker-shim -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/worker-shim/java_pid%p.hprof /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof'
75+
- JAVA_OPTS=-Dwres.broker=${WRES_BROKER_HOST} -Dcom.redhat.fips=false -Dwres.trustStore=${WRES_TRUST_STORE} -Dwres.trustStorePassword=${WRES_TRUST_STORE_PASSWORD} -Dwres.workerPathToClientP12Bundle=${WRES_WORKER_CLIENT_P12} -Dwres.workerPathToClientP12Password=${WRES_WORKER_CLIENT_P12_PASSWORD} -Djava.io.tmpdir=/mnt/wres_share/evaluations -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/worker-shim -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/worker-shim/java_pid%p.hprof /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/worker-shim/java_pid%p_$$CON_HOSTNAME.hprof'
4576
- PGPASSFILE=/wres_secrets/.pgpass
4677
# Use caller-specified db hostname from env var WRES_DB_FQDN.
4778
# Do not auto-liquibase-migrate on each evaluation. This requires an
@@ -64,7 +95,7 @@ services:
6495
- 5673
6596
ports:
6697
- 15673:15673
67-
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240821-1d5b305"
98+
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240913-80977b3"
6899
restart: always
69100
volumes:
70101
# For heap-dump files
@@ -73,6 +104,10 @@ services:
73104
- /mnt/wres_keys:/wres_secrets:ro
74105
environment:
75106
- BROKER_WORK=/container_home
107+
- BROKER_KEYSTORE_PATH=${EVENTSBROKER_KEYSTORE_PATH}
108+
- BROKER_KEYSTORE_PASSWORD=${EVENTSBROKER_KEYSTORE_PASSWORD}
109+
- BROKER_TRUSTSTORE_PATH=${EVENTSBROKER_TRUSTSTORE_PATH}
110+
- BROKER_TRUSTSTORE_PASSWORD=${EVENTSBROKER_TRUSTSTORE_PASSWORD}
76111
- JAVA_ARGS=-XX:+PrintClassHistogram -XX:+UseG1GC -XX:+UseStringDeduplication -Xms2048m -Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/eventsbroker -Dcom.redhat.fips=false
77112
- LANG=C.UTF-8
78113
# Broker heap is 2048m in JAVA_ARGS
@@ -86,7 +121,7 @@ services:
86121
depends_on:
87122
eventsbroker:
88123
condition: service_started
89-
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240821-1d5b305"
124+
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240913-80977b3"
90125
restart: always
91126
volumes:
92127
# To write graphics outputs
@@ -108,7 +143,7 @@ services:
108143
depends_on:
109144
eventsbroker:
110145
condition: service_started
111-
image: "${DOCKER_REGISTRY}/wres/wres-writing:20240821-1d5b305"
146+
image: "${DOCKER_REGISTRY}/wres/wres-writing:20240913-80977b3"
112147
restart: always
113148
volumes:
114149
# To write numeric outputs

0 commit comments

Comments
 (0)