Skip to content

Commit ec8f281

Browse files
HankHerr-NOAAHankHerr-NOAA
authored
Merge pull request #452 from NOAA-OWP/v30_docker_files
Docker files for v6.30; refs GitHub #448
2 parents 3bce492 + dc0cc95 commit ec8f281

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎compose-entry.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ networks:
66
ipam:
77
driver: default
88
config:
9-
- subnet: 172.19.254.64/26
10-
gateway: 172.19.254.65
9+
- subnet: 172.19.254.128/26
10+
gateway: 172.19.254.129
1111
volumes:
1212
home:
1313
driver_opts:
@@ -49,7 +49,7 @@ services:
4949
networks:
5050
wres_net:
5151
persister:
52-
image: "${DOCKER_REGISTRY}/wres/wres-redis:20250206-4273062"
52+
image: "${DOCKER_REGISTRY}/wres/wres-redis:20250311-3bce492"
5353
restart: always
5454
volumes:
5555
# For the job data
@@ -66,7 +66,7 @@ services:
6666
tasker:
6767
ports:
6868
- "443:8443"
69-
image: "${DOCKER_REGISTRY}/wres/wres-tasker:20250205-3d690e0"
69+
image: "${DOCKER_REGISTRY}/wres/wres-tasker:20250311-b792469"
7070
restart: always
7171
depends_on:
7272
broker:
@@ -102,7 +102,7 @@ services:
102102
- "5671:5671"
103103
- "15671:15671"
104104
- "15691:15691"
105-
image: "${DOCKER_REGISTRY}/wres/wres-broker:20250206-4273062"
105+
image: "${DOCKER_REGISTRY}/wres/wres-broker:20250311-3bce492"
106106
restart: always
107107
volumes:
108108
# For certificates and keys that correspond to them:
@@ -130,7 +130,7 @@ services:
130130
healthcheck:
131131
start_period: 5m
132132
worker:
133-
image: "${DOCKER_REGISTRY}/wres/wres-worker:20250206-4242541"
133+
image: "${DOCKER_REGISTRY}/wres/wres-worker:20250311-b792469"
134134
restart: always
135135
depends_on:
136136
broker:
@@ -164,10 +164,10 @@ services:
164164
# administrator to run the migration(s) during or after deployment.
165165
# Write heap dumps to the root of the volume above.
166166
# Override the broker address and port in the binding URL of the event.properties.
167-
- INNER_JAVA_OPTS=-Xmx8192m -Xms8192m -Dwres.maxPoolSize=13 -Dlogback.configurationFile=/opt/inner_logback.xml -Dwres.startBroker=false -Dwres.enableServerCache=false -Dwres.eventsBrokerAddress=eventsbroker -Dwres.eventsBrokerPort=5673 -Dwres.externalGraphics=true -Dwres.externalNumerics=true -Dwres.featureBatchSize=1 -Dwres.useDatabase=true -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/evaluations -Dwres.databaseHost=${WRES_DB_FQDN} -Dwres.certificateFileToTrust=${WRES_DB_CA_FILE} -Dwres.wrdsCertificateFileToTrust=${WRDS_CA_FILE} -Dwres.databaseName=wres8 -Dwres.username=wres_user8 -Dwres.attemptToMigrate=false -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/wres -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/wres/java_pid%p.hprof /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof' -XX:StartFlightRecording=settings=wres_jfr,maxsize=1280m,dumponexit=true,filename=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME -XX:FlightRecorderOptions=repository=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME/ -XX:+CrashOnOutOfMemoryError -Dtruststore=${DSTORE_TRUST_STORE} -Dtruststorepassword=${DSTORE_TRUST_STORE_PASS}
167+
- INNER_JAVA_OPTS=-Xmx16g -Xms16g -Dwres.maxPoolSize=25 -Dwres.maximumPoolThreads=12 -Dlogback.configurationFile=/opt/inner_logback.xml -Dwres.startBroker=false -Dwres.enableServerCache=false -Dwres.eventsBrokerAddress=eventsbroker -Dwres.eventsBrokerPort=5673 -Dwres.externalGraphics=true -Dwres.externalNumerics=true -Dwres.featureBatchSize=1 -Dwres.useDatabase=true -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/evaluations -Dwres.databaseHost=${WRES_DB_FQDN} -Dwres.certificateFileToTrust=${WRES_DB_CA_FILE} -Dwres.wrdsCertificateFileToTrust=${WRDS_CA_FILE} -Dwres.databaseName=wres8 -Dwres.username=wres_user8 -Dwres.attemptToMigrate=false -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/wres -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/wres/java_pid%p.hprof /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof' -XX:StartFlightRecording=settings=wres_jfr,maxsize=1280m,dumponexit=true,filename=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME -XX:FlightRecorderOptions=repository=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME/ -XX:+CrashOnOutOfMemoryError -Dtruststore=${DSTORE_TRUST_STORE} -Dtruststorepassword=${DSTORE_TRUST_STORE_PASS}
168168
- LANG=C.UTF-8
169169
# Shim JVM should have 64m max heap, core JVM should have 2560m max heap
170-
mem_limit: 12288m
170+
mem_limit: 20480m
171171
cap_drop:
172172
- ALL
173173
read_only: true
@@ -180,7 +180,7 @@ services:
180180
- 5673
181181
ports:
182182
- 15673:15673
183-
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20250206-4273062"
183+
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20250311-3bce492"
184184
restart: always
185185
volumes:
186186
# For heap-dump files
@@ -206,7 +206,7 @@ services:
206206
depends_on:
207207
eventsbroker:
208208
condition: service_started
209-
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20250205-3d690e0"
209+
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20250307-cabe830"
210210
restart: always
211211
volumes:
212212
# To write graphics outputs
@@ -228,7 +228,7 @@ services:
228228
depends_on:
229229
eventsbroker:
230230
condition: service_started
231-
image: "${DOCKER_REGISTRY}/wres/wres-writing:20250205-3d690e0"
231+
image: "${DOCKER_REGISTRY}/wres/wres-writing:20250307-cabe830"
232232
restart: always
233233
volumes:
234234
# To write numeric outputs

‎compose-workers.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
networks:
5050
wres_net:
5151
worker:
52-
image: "${DOCKER_REGISTRY}/wres/wres-worker:20250206-4242541"
52+
image: "${DOCKER_REGISTRY}/wres/wres-worker:20250311-b792469"
5353
restart: always
5454
depends_on:
5555
eventsbroker:
@@ -81,10 +81,10 @@ services:
8181
# administrator to run the migration(s) during or after deployment.
8282
# Write heap dumps to the root of the volume above.
8383
# Override the broker address and port in the binding URL of the event.properties.
84-
- INNER_JAVA_OPTS=-Xmx8192m -Xms8192m -Dwres.maxPoolSize=13 -Dlogback.configurationFile=/opt/inner_logback.xml -Dwres.startBroker=false -Dwres.enableServerCache=false -Dwres.eventsBrokerAddress=eventsbroker -Dwres.eventsBrokerPort=5673 -Dwres.externalGraphics=true -Dwres.externalNumerics=true -Dwres.featureBatchSize=1 -Dwres.useDatabase=true -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/evaluations -Dwres.databaseHost=${WRES_DB_FQDN} -Dwres.certificateFileToTrust=${WRES_DB_CA_FILE} -Dwres.wrdsCertificateFileToTrust=${WRDS_CA_FILE} -Dwres.databaseName=wres8 -Dwres.username=wres_user8 -Dwres.attemptToMigrate=false -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/wres -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/wres/java_pid%p.hprof /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof' -XX:StartFlightRecording=settings=wres_jfr,maxsize=1280m,dumponexit=true,filename=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME -XX:FlightRecorderOptions=repository=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME/ -XX:+CrashOnOutOfMemoryError -Dtruststore=${DSTORE_TRUST_STORE} -Dtruststorepassword=${DSTORE_TRUST_STORE_PASS}
84+
- INNER_JAVA_OPTS=-Xmx16g -Xms16g -Dwres.maxPoolSize=25 -Dwres.maximumPoolThreads=12 -Dlogback.configurationFile=/opt/inner_logback.xml -Dwres.startBroker=false -Dwres.enableServerCache=false -Dwres.eventsBrokerAddress=eventsbroker -Dwres.eventsBrokerPort=5673 -Dwres.externalGraphics=true -Dwres.externalNumerics=true -Dwres.featureBatchSize=1 -Dwres.useDatabase=true -Dcom.redhat.fips=false -Djava.io.tmpdir=/mnt/wres_share/evaluations -Dwres.databaseHost=${WRES_DB_FQDN} -Dwres.certificateFileToTrust=${WRES_DB_CA_FILE} -Dwres.wrdsCertificateFileToTrust=${WRDS_CA_FILE} -Dwres.databaseName=wres8 -Dwres.username=wres_user8 -Dwres.attemptToMigrate=false -XX:HeapDumpPath=/mnt/wres_share/heap_dumps/wres -XX:OnOutOfMemoryError='mv /mnt/wres_share/heap_dumps/wres/java_pid%p.hprof /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof; chmod 775 /mnt/wres_share/heap_dumps/wres/java_pid%p_$$CON_HOSTNAME.hprof' -XX:StartFlightRecording=settings=wres_jfr,maxsize=1280m,dumponexit=true,filename=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME -XX:FlightRecorderOptions=repository=/mnt/wres_share/heap_dumps/wres/$$CON_HOSTNAME/ -XX:+CrashOnOutOfMemoryError -Dtruststore=${DSTORE_TRUST_STORE} -Dtruststorepassword=${DSTORE_TRUST_STORE_PASS}
8585
- LANG=C.UTF-8
8686
# Shim JVM should have 64m max heap, core JVM should have 2560m max heap
87-
mem_limit: 12288m
87+
mem_limit: 20480m
8888
cap_drop:
8989
- ALL
9090
read_only: true
@@ -97,7 +97,7 @@ services:
9797
- 5673
9898
ports:
9999
- 15673:15673
100-
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20250206-4273062"
100+
image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20250311-3bce492"
101101
restart: always
102102
volumes:
103103
# For heap-dump files
@@ -123,7 +123,7 @@ services:
123123
depends_on:
124124
eventsbroker:
125125
condition: service_started
126-
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20250205-3d690e0"
126+
image: "${DOCKER_REGISTRY}/wres/wres-graphics:20250307-cabe830"
127127
restart: always
128128
volumes:
129129
# To write graphics outputs
@@ -145,7 +145,7 @@ services:
145145
depends_on:
146146
eventsbroker:
147147
condition: service_started
148-
image: "${DOCKER_REGISTRY}/wres/wres-writing:20250205-3d690e0"
148+
image: "${DOCKER_REGISTRY}/wres/wres-writing:20250307-cabe830"
149149
restart: always
150150
volumes:
151151
# To write numeric outputs

0 commit comments

Comments
 (0)