Merge branch 'master' into issue245

NOAA-OWP · Oct 23, 2024 · 9dc4643 · 9dc4643
2 parents ab0b9d6 + 48a4ecb
commit 9dc4643
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 115 deletions.
diff --git a/.github/workflows/commitChecks.yml b/.github/workflows/commitChecks.yml
@@ -12,7 +12,10 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 0
+
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:

diff --git a/.github/workflows/databaseMigrationChecks.yml b/.github/workflows/databaseMigrationChecks.yml
@@ -28,6 +28,8 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v1
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

diff --git a/.github/workflows/dockerRelease.yml b/.github/workflows/dockerRelease.yml
@@ -11,7 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 0
 
     # Zips the docker related components of the release to store them
     - name: Tar Docker

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -109,6 +109,8 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v1
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 0
 
     # Downloads the pre-release release to copy the artifacts used for testing
     - uses: robinraju/release-downloader@v1.10

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \

diff --git a/build.gradle b/build.gradle
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

diff --git a/scripts/localWindowsDeployScripts/eventsbroker/Dockerfile b/scripts/localWindowsDeployScripts/eventsbroker/Dockerfile
@@ -31,7 +31,7 @@ RUN apk add tar && \
 FROM registry.access.redhat.com/ubi8/ubi:8.8-1009
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     procps-ng-3.3.15-14.el8 \
     iproute-6.2.0-5.el8_9 \
     libaio-0.3.112-1.el8 \

diff --git a/scripts/localWindowsDeployScripts/tasker/Dockerfile b/scripts/localWindowsDeployScripts/tasker/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi8/ubi:8.8-1009
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     procps-ng-3.3.15-14.el8 \
     iproute-6.2.0-5.el8_9 \

diff --git a/scripts/localWindowsDeployScripts/vis/Dockerfile b/scripts/localWindowsDeployScripts/vis/Dockerfile
@@ -2,7 +2,7 @@
 FROM registry.access.redhat.com/ubi8/ubi:8.8-1009
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \

diff --git a/scripts/localWindowsDeployScripts/wres/Dockerfile b/scripts/localWindowsDeployScripts/wres/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi8/ubi:8.8-1009
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \

diff --git a/wres-eventsbroker/Dockerfile b/wres-eventsbroker/Dockerfile
@@ -28,10 +28,10 @@ RUN apk --no-cache add tar && \
 # Final image
 #############
 
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     procps-ng-3.3.15-14.el8 \
     iproute-6.2.0-6.el8_10.x86_64 \
     libaio-0.3.112-1.el8 \

diff --git a/wres-tasker/Dockerfile b/wres-tasker/Dockerfile
@@ -1,7 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     procps-ng-3.3.15-14.el8 \
     iproute-6.2.0-6.el8_10.x86_64 \

diff --git a/wres-vis/Dockerfile b/wres-vis/Dockerfile
@@ -1,8 +1,8 @@
 # From a base image, make updates
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \

diff --git a/wres-writing/Dockerfile b/wres-writing/Dockerfile
@@ -1,8 +1,8 @@
 # From a base image, make updates
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \