Merge branch 'master' into fetchDepth

NOAA-OWP · Oct 22, 2024 · 7855a9f · 7855a9f
2 parents 825407b + 07d75b2
commit 7855a9f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/compose-entry.yml b/compose-entry.yml
@@ -18,6 +18,7 @@ services:
     nginx:
       image: "${DOCKER_REGISTRY}/wres/nginx"
       container_name: nginx_proxy
+      restart: always
       volumes:
         - ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
         - ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
@@ -30,6 +31,7 @@ services:
     cadvisor:
       image: gcr.io/cadvisor/cadvisor:latest
       container_name: cadvisor
+      restart: always
       ports:
         - 8080:8080
       volumes:
@@ -47,7 +49,7 @@ services:
       networks:
         wres_net:
     persister:
-        image: "${DOCKER_REGISTRY}/wres/wres-redis:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-redis:20241018-74b8415"
         restart: always
         volumes:
          # For the job data
@@ -64,7 +66,7 @@ services:
     tasker:
         ports:
          - "443:8443"
-        image: "${DOCKER_REGISTRY}/wres/wres-tasker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-tasker:20241018-74b8415"
         restart: always
         depends_on:
             broker:
@@ -100,7 +102,7 @@ services:
          - "5671:5671"
          - "15671:15671"
          - "15691:15691"
-        image: "${DOCKER_REGISTRY}/wres/wres-broker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-broker:20241018-74b8415"
         restart: always
         volumes:
          # For certificates and keys that correspond to them:
@@ -128,7 +130,7 @@ services:
         healthcheck:
             start_period: 5m
     worker:
-        image: "${DOCKER_REGISTRY}/wres/wres-worker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241018-74b8415"
         restart: always
         depends_on:
             broker:
@@ -178,7 +180,7 @@ services:
          - 5673
         ports:
          - 15673:15673
-        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241018-74b8415"
         restart: always
         volumes:
          # For heap-dump files
@@ -204,7 +206,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241018-74b8415"
         restart: always
         volumes:
          # To write graphics outputs
@@ -226,7 +228,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-writing:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241018-74b8415"
         restart: always
         volumes:
          # To write numeric outputs

diff --git a/compose-workers.yml b/compose-workers.yml
@@ -18,6 +18,7 @@ services:
     nginx:
       image: "${DOCKER_REGISTRY}/wres/nginx"
       container_name: nginx_proxy
+      restart: always
       volumes:
         - ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
         - ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
@@ -30,6 +31,7 @@ services:
     cadvisor:
       image: gcr.io/cadvisor/cadvisor:latest
       container_name: cadvisor
+      restart: always
       ports:
         - 8080:8080
       volumes:
@@ -47,7 +49,7 @@ services:
       networks:
         wres_net:
     worker:
-        image: "${DOCKER_REGISTRY}/wres/wres-worker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241018-74b8415"
         restart: always
         depends_on:
             eventsbroker:
@@ -95,7 +97,7 @@ services:
          - 5673
         ports:
          - 15673:15673
-        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241018-74b8415"
         restart: always
         volumes:
          # For heap-dump files
@@ -121,7 +123,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241018-74b8415"
         restart: always
         volumes:
          # To write graphics outputs
@@ -143,7 +145,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-writing:20240913-80977b3"
+        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241018-74b8415"
         restart: always
         volumes:
          # To write numeric outputs