Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1pt] PR: Upgrade JDK to v.17 #1047

Merged
merged 4 commits into from
Dec 8, 2023
Merged

[1pt] PR: Upgrade JDK to v.17 #1047

merged 4 commits into from
Dec 8, 2023

Conversation

mluck
Copy link
Contributor

@mluck mluck commented Dec 8, 2023

Upgrades JDK in Docker image to v.17.0.9. Resolves #1029.

Note: We may still want to upgrade GDAL to a more current version than v.3.4.3 but this will require getting past the TauDEM aread8 isssue so GDAL in the current image is still fixed at v.3.4.3.

Changes

  • Dockerfile: Adds JDK v17 to image

Testing

Ran fim_pipeline.sh and synthesize_test_cases.py on HUCs 12040101 and 12090301 against v.4.4.7.1 with identical evaluation results.

Issuer Checklist (For developer use)

You may update this checklist before and/or after creating the PR. If you're unsure about any of them, please ask, we're here to help! These items are what we are going to look for before merging your code.

  • Informative and human-readable title, using the format: [_pt] PR: <description>
  • Links are provided if this PR resolves an issue, or depends on another other PR
  • If submitting a PR to the dev branch (the default branch), you have a descriptive Feature Branch name using the format: dev-<description-of-change> (e.g. dev-revise-levee-masking)
  • Changes are limited to a single goal (no scope creep)
  • The feature branch you're submitting as a PR is up to date (merged) with the latest dev branch
  • pre-commit hooks were run locally
  • Any change in functionality is tested
  • Passes all unit tests locally (inside interactive Docker container, at /foss_fim/, run: pytest unit_tests/)
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • CHANGELOG updated with template version number, e.g. 4.x.x.x
  • Reviewers requested
  • Add yourself as an assignee in the PR as well as the FIM Technical Lead

Merge Checklist (For Technical Lead use only)

  • Update CHANGELOG with latest version number and merge date
  • Update the Citation.cff file to reflect the latest version number in the CHANGELOG
  • If applicable, update README with major alterations

@mluck mluck added the dependencies Pull requests that update a dependency file label Dec 8, 2023
@mluck mluck requested a review from robgpita December 8, 2023 15:59
robgpita
robgpita previously approved these changes Dec 8, 2023
Copy link
Contributor

@robgpita robgpita left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Pulled this branch into PR #1045 for testing.
Re-generated unit test data using fim_pipeline.sh and all checks out.

@CarsonPruitt-NOAA CarsonPruitt-NOAA merged commit 79f8a82 into dev Dec 8, 2023
1 check passed
@CarsonPruitt-NOAA CarsonPruitt-NOAA deleted the dev-jdk-17 branch December 8, 2023 20:51
@robgpita
Copy link
Contributor

robgpita commented Dec 21, 2023

Nikki at ITSG re-ran a security scan on dev1, which currently only contains the most recent Docker image. Unfortunately, the scan is still catching a vulnerability in Java 11 openjdk. This remnant is most likely due to the older version of jdk used in the builder image we're using (ghcr.io/osgeo/gdal:ubuntu-full-3.4.3). Two paths forward to address this would include:

  • preferred- Upgrading the osgeo/gdal version which includes a newer version of jdk, and refactoring to addressing the downstream dependencies' incompatabilities (@mluck is currently working on this option)
  • temporary workaround- Updating the Dockerfile to remove the older version of jdk to pass the security scan

Output from scan (without path on dev1):

 Installed version : 11.0.15
  Fixed version     : Upgrade to a version greater than 11.0.18 

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[21pt] Upgrade jdk or our base Docker image
3 participants