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

Update base java image to amazoncorretto:11-al2023-headless #635

Merged
merged 2 commits into from
May 9, 2024

Conversation

AndreKurait
Copy link
Member

@AndreKurait AndreKurait commented May 6, 2024

Description

Update base java image to amazoncorretto:11-al2023-headless removing deprecated openjdk:11-jre

  • Category: Maintenance
  • Why these changes are required? Docker Image openjdk is depreacted
  • What is the old behavior before changes and new behavior after changes? Base image used now amazoncorretto instead of openjdk

Issues Resolved

MIGRATIONS-1724

Is this a backport? If so, please add backport PR # and/or commits #

Testing

Docker Solution startup and integration tests

Check List

  • [ x] New functionality includes testing
    • [ x] All tests pass, including unit test, integration test and doctest
  • [N/A ] New functionality has been documented
  • [x ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@@ -57,8 +57,8 @@ class CommonUtils {
runCommand("sed -i -e \"s|mirrorlist=|#mirrorlist=|g\" /etc/yum.repos.d/CentOS-* ; sed -i -e \"s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g\" /etc/yum.repos.d/CentOS-*")
runCommand("yum -y install nmap-ncat")
} else {
from 'openjdk:11-jre'
runCommand("apt-get update && apt-get install -y netcat")
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't believe that we need netcat any more.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Agreed, I'd be surprised if we were using this anywhere and should probably remove

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed

@@ -1,5 +1,5 @@
# Using same base image as other Java containers in this repo
FROM openjdk:11-jre
FROM amazoncorretto:11-al2023-headless
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you mentioned this before but I can't remember... Are we in any better position if we pull from ECR versus Docker

Copy link
Member Author

Choose a reason for hiding this comment

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

This isn't ECR, this is the docker hub hosted corretto version.

Before using ECR, we should add aws credentials to our actions

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: Andre Kurait <akurait@amazon.com>
Copy link

codecov bot commented May 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.59%. Comparing base (2ae2959) to head (eee8d47).
Report is 5 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #635      +/-   ##
============================================
- Coverage     75.84%   75.59%   -0.25%     
+ Complexity     1545     1539       -6     
============================================
  Files           168      168              
  Lines          6446     6446              
  Branches        574      574              
============================================
- Hits           4889     4873      -16     
- Misses         1177     1192      +15     
- Partials        380      381       +1     
Flag Coverage Δ
unittests 75.59% <ø> (-0.25%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AndreKurait AndreKurait merged commit 995d240 into opensearch-project:main May 9, 2024
6 of 7 checks passed
@AndreKurait AndreKurait deleted the FixDeprecatedImage branch May 9, 2024 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants