Merge pull request #635 from AndreKurait/FixDeprecatedImage

Update base java image to amazoncorretto:11-al2023-headless
opensearch-project · May 9, 2024 · 995d240 · 995d240
2 parents 4fe92d0 + eee8d47
commit 995d240
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/RFS/docker/Dockerfile b/RFS/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Using same base image as other Java containers in this repo
-FROM openjdk:11-jre
+FROM amazoncorretto:11-al2023-headless
 # Requires Gradle to genearte runtime jars initially
 COPY ./build/runtimeJars /rfs-app/jars
 WORKDIR /rfs-app

diff --git a/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy b/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy
@@ -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")
+                from 'amazoncorretto:11-al2023-headless'
             }
 
             copyFile("jars", "/jars")