Merge pull request #101 from NOAA-OWP/deployment_6.25

fixes #67 Dependency and dockerfile upgrades for deployment
NOAA-OWP · Aug 20, 2024 · 4d9d453 · 4d9d453
2 parents 4cc1107 + 5321359
commit 4d9d453
Show file tree

Hide file tree

Showing 14 changed files with 111 additions and 106 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.9-1160.1715068735
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.11.0.9-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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/scripts/localWindowsDeployScripts/broker/Dockerfile b/scripts/localWindowsDeployScripts/broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq:3.12.1-management-alpine
+FROM rabbitmq:3.13.6-management-alpine
 
 # Wish we could do the following, but busybox does not support long gids:
 #RUN addgroup -g 1370800073 wres && adduser -D -u 498 -g 1370800073 wres_docker

diff --git a/scripts/localWindowsDeployScripts/eventsbroker/Dockerfile b/scripts/localWindowsDeployScripts/eventsbroker/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM alpine AS builder
 
-ARG BROKER_VERSION=2.30.0
+ARG BROKER_VERSION=2.36.0
 
 WORKDIR /workspace
 
@@ -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.8.0.7-2.el8 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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/redis/Dockerfile b/scripts/localWindowsDeployScripts/redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM redis:6.2.13-alpine3.18
+FROM redis:7.4-alpine3.20
 
 # See comments in main/worker/root wres Dockerfile
 # Instead, very manually create user and group:

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.8.0.7-2.el8 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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.8.0.7-2.el8 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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.8.0.7-2.el8 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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-broker/Dockerfile b/wres-broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq:3.13.3-management-alpine
+FROM rabbitmq:3.13.6-management-alpine
 
 # Wish we could do the following, but busybox does not support long gids:
 #RUN addgroup -g 1370800073 wres && adduser -D -u 498 -g 1370800073 wres_docker

diff --git a/wres-eventsbroker/Dockerfile b/wres-eventsbroker/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM alpine:3.19.1 AS builder
 
-ARG BROKER_VERSION=2.34.0
+ARG BROKER_VERSION=2.36.0
 
 WORKDIR /workspace
 
@@ -28,10 +28,10 @@ RUN apk --no-cache add tar && \
 # Final image
 #############
 
-FROM registry.access.redhat.com/ubi8/ubi:8.9-1160.1715068735
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.11.0.9-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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-redis/Dockerfile b/wres-redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM redis:7.2.4-alpine3.19
+FROM redis:7.4-alpine3.20
 
 # See comments in main/worker/root wres Dockerfile
 # Instead, very manually create user and group:

diff --git a/wres-tasker/Dockerfile b/wres-tasker/Dockerfile
@@ -1,7 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.9-1160.1715068735
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.11.0.9-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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.9-1160.1715068735
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.11.0.9-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.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.9-1160.1715068735
+FROM registry.access.redhat.com/ubi8/ubi:8.10-1054
 
 RUN dnf install -y \
-    java-17-openjdk-headless-1:17.0.11.0.9-2.el8.x86_64 \
+    java-17-openjdk-headless-1:17.0.12.0.7-2.el8.x86_64 \
     unzip-6.0-46.el8 \
     fontconfig-2.13.1-4.el8 \
     dejavu-fonts-common-2.35-7.el8 \