From ca3c6286c763a13c4b47e9625838e164b57f81d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CMattLuck-NOAA=E2=80=9D?= Date: Thu, 7 Dec 2023 19:36:26 -0500 Subject: [PATCH 1/3] Upgrade JDK to v17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 101fcb2e0..42734aba2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN git clone https://github.com/dtarb/taudem.git RUN git clone https://github.com/fernandoa123/cybergis-toolkit.git taudem_accelerated_flowDirections RUN apt-get update --fix-missing && apt-get install -y cmake mpich \ - libgtest-dev libboost-test-dev libnetcdf-dev && rm -rf /var/lib/apt/lists/* + libgtest-dev libboost-test-dev libnetcdf-dev openjdk-17-jdk && rm -rf /var/lib/apt/lists/* ## Compile Main taudem repo ## RUN mkdir -p taudem/bin From 53ae9e413f11610e534bbd5910a58f5dc9cb121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CMattLuck-NOAA=E2=80=9D?= Date: Thu, 7 Dec 2023 22:37:28 -0500 Subject: [PATCH 2/3] Edit Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 42734aba2..512e726dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,7 @@ RUN mkdir -p $depDir COPY --from=builder $depDir $depDir RUN apt update --fix-missing -RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y p7zip-full python3-pip time mpich=3.3.2-2build1 parallel=20161222-1.1 libgeos-dev=3.8.0-1build1 expect=5.45.4-2build1 tmux rsync tzdata +RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y p7zip-full python3-pip time mpich=3.3.2-2build1 parallel=20161222-1.1 libgeos-dev=3.8.0-1build1 expect=5.45.4-2build1 tmux rsync tzdata openjdk-17-jdk RUN apt auto-remove From c3da7b5392b55be02f58a8c79011b0934e844b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CMattLuck-NOAA=E2=80=9D?= Date: Fri, 8 Dec 2023 12:55:09 -0500 Subject: [PATCH 3/3] Update CHANGELOG.md --- docs/CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 09d892805..849ac6736 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,16 @@ All notable changes to this project will be documented in this file. We follow the [Semantic Versioning 2.0.0](http://semver.org/) format. +## v4.4.x.x - 2023-12-08 - [PR#1047](https://github.com/NOAA-OWP/inundation-mapping/pull/1047) + +Upgrades JDK to v.17.0.9 in Docker image to address security vulnerabilities. + +### Changes + +- `Dockerfile`: Upgrades JDK to v.17. + +

+ ## v4.4.7.1 - 2023-12-01 - [PR#1036](https://github.com/NOAA-OWP/inundation-mapping/pull/1036) Quick update to match incoming ras2fim calibration output files being feed into FIM was the initial change.