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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
May 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c58696e
Update base java image to amazoncorretto:11-al2023-headless
AndreKurait May 6, 2024
eee8d47
Remove nmap-ncat
AndreKurait May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RFS/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

# Requires Gradle to genearte runtime jars initially
COPY ./build/runtimeJars /rfs-app/jars
WORKDIR /rfs-app
Expand Down
4 changes: 1 addition & 3 deletions TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ class CommonUtils {
from "migrations/${dependentDockerImageName}:${hashNonce}"
dependsOn "buildDockerImage_${baseImageOverrideProjectName}"
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

from 'amazoncorretto:11-al2023-headless'
}

copyFile("jars", "/jars")
Expand Down