Minor dependency updates.

NOAA-OWP · Dec 9, 2024 · 33eacdb · 33eacdb
1 parent b735d54
commit 33eacdb
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 171 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1132
 
 RUN dnf install -y \
     java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \

diff --git a/build.gradle b/build.gradle
diff --git a/compose-entry.yml b/compose-entry.yml
@@ -49,7 +49,7 @@ services:
       networks:
         wres_net:
     persister:
-        image: "${DOCKER_REGISTRY}/wres/wres-redis:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-redis:20241126-b735d54-dev"
         restart: always
         volumes:
          # For the job data
@@ -66,7 +66,7 @@ services:
     tasker:
         ports:
          - "443:8443"
-        image: "${DOCKER_REGISTRY}/wres/wres-tasker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-tasker:20241113-6f1b17d-dev"
         restart: always
         depends_on:
             broker:
@@ -102,7 +102,7 @@ services:
          - "5671:5671"
          - "15671:15671"
          - "15691:15691"
-        image: "${DOCKER_REGISTRY}/wres/wres-broker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-broker:20241126-b735d54-dev"
         restart: always
         volumes:
          # For certificates and keys that correspond to them:
@@ -130,7 +130,7 @@ services:
         healthcheck:
             start_period: 5m
     worker:
-        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241126-b735d54-dev"
         restart: always
         depends_on:
             broker:
@@ -180,7 +180,7 @@ services:
          - 5673
         ports:
          - 15673:15673
-        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241126-b735d54-dev"
         restart: always
         volumes:
          # For heap-dump files
@@ -206,7 +206,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241126-2da40a3-dev"
         restart: always
         volumes:
          # To write graphics outputs
@@ -228,7 +228,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241126-2da40a3-dev"
         restart: always
         volumes:
          # To write numeric outputs

diff --git a/compose-workers.yml b/compose-workers.yml
@@ -49,7 +49,7 @@ services:
       networks:
         wres_net:
     worker:
-        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-worker:20241126-b735d54-dev"
         restart: always
         depends_on:
             eventsbroker:
@@ -97,7 +97,7 @@ services:
          - 5673
         ports:
          - 15673:15673
-        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-eventsbroker:20241126-b735d54-dev"
         restart: always
         volumes:
          # For heap-dump files
@@ -123,7 +123,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-graphics:20241126-2da40a3-dev"
         restart: always
         volumes:
          # To write graphics outputs
@@ -145,7 +145,7 @@ services:
         depends_on:
             eventsbroker:
                 condition: service_started
-        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241018-74b8415"
+        image: "${DOCKER_REGISTRY}/wres/wres-writing:20241126-2da40a3-dev"
         restart: always
         volumes:
          # To write numeric outputs

diff --git a/scripts/dockerize.sh b/scripts/dockerize.sh
@@ -66,6 +66,7 @@ wres_writing_version=$writing_version
 if [[ "$1" != "" && "$1" != "auto" ]]
 then
     wres_core_version=$1
+    overall_version=$wres_core_version
 fi
 
 if [[ "$2" != "" && "$2" != "auto" ]]
@@ -76,6 +77,7 @@ fi
 if [[ "$3" != "" && "$3" != "auto" ]]
 then
     wres_tasker_version=$3
+    tasker_version=$wres_tasker_version
 fi
 
 if [[ "$4" != "" && "$4" != "auto" ]]
@@ -96,11 +98,13 @@ fi
 if [[ "$7" != "" && "$7" != "auto" ]]
 then
     wres_vis_version=$7
+    graphics_version=$wres_vis_version
 fi
 
 if [[ "$8" != "" && "$8" != "auto" ]]
 then
     wres_writing_version=$8
+    writing_version=$wres_writing_version
 fi
 
 echo ""
@@ -248,82 +252,33 @@ then
             exit 2
         fi
 
-        primary_image_dev_status=$( echo ${overall_version} | grep "dev" )
-
-        if [[ "$primary_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push primary docker image version ${overall_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-worker:$overall_version as $DOCKER_REGISTRY/wres/wres-worker/$overall_version..."
-            docker tag wres/wres-worker:$overall_version $DOCKER_REGISTRY/wres/wres-worker:$overall_version
-	        docker push $DOCKER_REGISTRY/wres/wres-worker:$overall_version
-        fi
-
-        tasker_image_dev_status=$( echo ${tasker_version} | grep "dev" )
-
-        if [[ "$tasker_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push tasker docker image version ${tasker_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing  wres/wres-tasker:$tasker_version as $DOCKER_REGISTRY/wres/wres-tasker/$tasker_version..."
-	        docker tag wres/wres-tasker:$tasker_version $DOCKER_REGISTRY/wres/wres-tasker:$tasker_version
-            docker push $DOCKER_REGISTRY/wres/wres-tasker:$tasker_version
-        fi
-
-        broker_image_dev_status=$( echo ${broker_version} | grep "dev" )
-
-        if [[ "$broker_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push broker docker image version ${broker_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-broker:$broker_version as $DOCKER_REGISTRY/wres/wres-broker/$broker_version..."
-            docker tag wres/wres-broker:$broker_version $DOCKER_REGISTRY/wres/wres-broker:$broker_version
-            docker push $DOCKER_REGISTRY/wres/wres-broker:$broker_version
-        fi
-
-        redis_image_dev_status=$( echo ${redis_version} | grep "dev" )
-
-        if [[ "$redis_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push redis docker image version ${redis_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-redis:$redis_version as $DOCKER_REGISTRY/wres/wres-redis/$redis_version..."
-            docker tag wres/wres-redis:$redis_version $DOCKER_REGISTRY/wres/wres-redis:$redis_version
-            docker push $DOCKER_REGISTRY/wres/wres-redis:$redis_version
-        fi
-
-        eventsbroker_image_dev_status=$( echo ${eventsbroker_version} | grep "dev" )
-
-        if [[ "$eventsbroker_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push eventsbroker docker image version ${eventsbroker_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-eventsbroker:$eventsbroker_version as $DOCKER_REGISTRY/wres/wres-eventsbroker/$eventsbroker_version..."
-            docker tag wres/wres-eventsbroker:$eventsbroker_version $DOCKER_REGISTRY/wres/wres-eventsbroker:$eventsbroker_version
-            docker push $DOCKER_REGISTRY/wres/wres-eventsbroker:$eventsbroker_version
-        fi
-
-        graphics_image_dev_status=$( echo ${graphics_version} | grep "dev" )
-
-        if [[ "$graphics_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push graphics docker image version ${graphics_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-graphics:$graphics_version as $DOCKER_REGISTRY/wres/wres-graphics/$graphics_version..."
-            docker tag wres/wres-graphics:$graphics_version $DOCKER_REGISTRY/wres/wres-graphics:$graphics_version
-            docker push $DOCKER_REGISTRY/wres/wres-graphics:$graphics_version
-        fi
-
-        writing_image_dev_status=$( echo ${writing_version} | grep "dev" )
-
-        if [[ "$writing_image_dev_status" != "" ]]
-        then
-            echo "Refusing to tag and push writing docker image version ${writing_version} because its Dockerfile has not been committed to the repository yet."
-        else
-            echo "Tagging and pushing wres/wres-writing:$writing_version as $DOCKER_REGISTRY/wres/wres-writing/$writing_version..."
-            docker tag wres/wres-writing:$writing_version $DOCKER_REGISTRY/wres/wres-writing:$writing_version
-            docker push $DOCKER_REGISTRY/wres/wres-writing:$writing_version
-        fi
+        echo "Tagging and pushing wres/wres-worker:$overall_version as $DOCKER_REGISTRY/wres/wres-worker/$overall_version..."
+        docker tag wres/wres-worker:$overall_version $DOCKER_REGISTRY/wres/wres-worker:$overall_version
+        docker push $DOCKER_REGISTRY/wres/wres-worker:$overall_version
+
+        echo "Tagging and pushing  wres/wres-tasker:$tasker_version as $DOCKER_REGISTRY/wres/wres-tasker/$tasker_version..."
+        docker tag wres/wres-tasker:$tasker_version $DOCKER_REGISTRY/wres/wres-tasker:$tasker_version
+        docker push $DOCKER_REGISTRY/wres/wres-tasker:$tasker_version
+
+        echo "Tagging and pushing wres/wres-broker:$broker_version as $DOCKER_REGISTRY/wres/wres-broker/$broker_version..."
+        docker tag wres/wres-broker:$broker_version $DOCKER_REGISTRY/wres/wres-broker:$broker_version
+        docker push $DOCKER_REGISTRY/wres/wres-broker:$broker_version
+
+        echo "Tagging and pushing wres/wres-redis:$redis_version as $DOCKER_REGISTRY/wres/wres-redis/$redis_version..."
+        docker tag wres/wres-redis:$redis_version $DOCKER_REGISTRY/wres/wres-redis:$redis_version
+        docker push $DOCKER_REGISTRY/wres/wres-redis:$redis_version
+
+        echo "Tagging and pushing wres/wres-eventsbroker:$eventsbroker_version as $DOCKER_REGISTRY/wres/wres-eventsbroker/$eventsbroker_version..."
+        docker tag wres/wres-eventsbroker:$eventsbroker_version $DOCKER_REGISTRY/wres/wres-eventsbroker:$eventsbroker_version
+        docker push $DOCKER_REGISTRY/wres/wres-eventsbroker:$eventsbroker_version
+
+        echo "Tagging and pushing wres/wres-graphics:$graphics_version as $DOCKER_REGISTRY/wres/wres-graphics/$graphics_version..."
+        docker tag wres/wres-graphics:$graphics_version $DOCKER_REGISTRY/wres/wres-graphics:$graphics_version
+        docker push $DOCKER_REGISTRY/wres/wres-graphics:$graphics_version
+
+        echo "Tagging and pushing wres/wres-writing:$writing_version as $DOCKER_REGISTRY/wres/wres-writing/$writing_version..."
+        docker tag wres/wres-writing:$writing_version $DOCKER_REGISTRY/wres/wres-writing:$writing_version
+        docker push $DOCKER_REGISTRY/wres/wres-writing:$writing_version
 
         echo "Tagging and pushing wres/nginx as wres/nginx..."
         docker tag wres/nginx $DOCKER_REGISTRY/wres/nginx

diff --git a/wres-eventsbroker/Dockerfile b/wres-eventsbroker/Dockerfile
@@ -28,7 +28,7 @@ RUN apk --no-cache add tar && \
 # Final image
 #############
 
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1132
 
 RUN dnf install -y \
     java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \

diff --git a/wres-redis/Dockerfile b/wres-redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM redis:7.4-alpine3.20
+FROM redis:7.4.1-alpine3.20
 
 # See comments in main/worker/root wres Dockerfile
 # Instead, very manually create user and group:

diff --git a/wres-vis/Dockerfile b/wres-vis/Dockerfile
@@ -1,5 +1,5 @@
 # From a base image, make updates
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1132
 
 RUN dnf install -y \
     java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \

diff --git a/wres-writing/Dockerfile b/wres-writing/Dockerfile
@@ -1,5 +1,5 @@
 # From a base image, make updates
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1088
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1132
 
 RUN dnf install -y \
     java-17-openjdk-headless-1:17.0.13.0.11-3.el8.x86_64 \