Apply fixes for Corretto runtime versions

aws · Oct 2, 2024 · edad5c3 · edad5c3
1 parent 1bd6ad2
commit edad5c3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/al2/aarch64/standard/2.0/runtimes.yml b/al2/aarch64/standard/2.0/runtimes.yml
@@ -44,10 +44,10 @@ runtimes:
       default:
         commands:
           - echo "Installing custom Corretto(OpenJDK) version $VERSION ..."
-          - yum -y install java-$VERSION-amazon-corretto-devel
           - export JAVA_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JRE_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JDK_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
+          - export JRE_HOME=$JAVA_HOME
+          - export JDK_HOME=$JAVA_HOME
+          - yum --disablerepo="*" --enablerepo="AmazonCorretto" -y install java-$VERSION-amazon-corretto-devel
           - |-
             for tool_path in "$JAVA_HOME"/bin/*;
              do tool=`basename "$tool_path"`;

diff --git a/al2/aarch64/standard/3.0/runtimes.yml b/al2/aarch64/standard/3.0/runtimes.yml
@@ -70,10 +70,10 @@ runtimes:
       default:
         commands:
           - echo "Installing custom Corretto(OpenJDK) version $VERSION ..."
-          - yum -y install java-$VERSION-amazon-corretto-devel
           - export JAVA_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JRE_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JDK_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
+          - export JRE_HOME=$JAVA_HOME
+          - export JDK_HOME=$JAVA_HOME
+          - yum --disablerepo="*" --enablerepo="AmazonCorretto" -y install java-$VERSION-amazon-corretto-devel
           - |-
             for tool_path in "$JAVA_HOME"/bin/*;
              do tool=`basename "$tool_path"`;

diff --git a/al2/x86_64/standard/4.0/runtimes.yml b/al2/x86_64/standard/4.0/runtimes.yml
@@ -25,14 +25,11 @@ runtimes:
           - |
             if [ "$VERSION" = "8" ]; then
               JAVA_VERSION="1.8.0"
-              JAVA_HOME="/usr/lib/jvm/java-$JAVA_VERSION-amazon-corretto.x86_64"
-            else
-              JAVA_HOME="/usr/lib/jvm/java-$JAVA_VERSION-amazon-corretto"
             fi
-          - export JAVA_HOME
+          - export JAVA_HOME="/usr/lib/jvm/java-$JAVA_VERSION-amazon-corretto"
           - export JRE_HOME=$JAVA_HOME
           - export JDK_HOME=$JAVA_HOME
-          - yum -y install java-$JAVA_VERSION-amazon-corretto-devel
+          - yum --disablerepo="*" --enablerepo="AmazonCorretto" -y install java-$JAVA_VERSION-amazon-corretto-devel
           - |
             for tool_path in "$JAVA_HOME"/bin/*; do
               tool=`basename "$tool_path"`

diff --git a/al2/x86_64/standard/5.0/Dockerfile b/al2/x86_64/standard/5.0/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
            perl-DBI perl-HTTP-Date perl-TimeDate perl-YAML-LibYAML \
            postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
            subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
-           amazon-ecr-credential-helper git-lfs acl \
+           amazon-ecr-credential-helper git-lfs acl glibc-langpack-en glibc-common \
     && rm /etc/yum.repos.d/mono-centos7-stable.repo
 
 RUN useradd codebuild-user

diff --git a/al2/x86_64/standard/5.0/runtimes.yml b/al2/x86_64/standard/5.0/runtimes.yml
@@ -66,10 +66,10 @@ runtimes:
       default:
         commands:
           - echo "Installing custom Corretto(OpenJDK) version $VERSION ..."
-          - yum -y install java-$VERSION-amazon-corretto-devel.x86_64
           - export JAVA_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JRE_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
-          - export JDK_HOME="/usr/lib/jvm/java-$VERSION-amazon-corretto"
+          - export JRE_HOME=$JAVA_HOME
+          - export JDK_HOME=$JAVA_HOME
+          - yum --disablerepo="*" --enablerepo="AmazonCorretto" -y install java-$VERSION-amazon-corretto-devel
           - |-
             for tool_path in "$JAVA_HOME"/bin/*;
              do tool=`basename "$tool_path"`;

diff --git a/ubuntu/standard/7.0/Dockerfile b/ubuntu/standard/7.0/Dockerfile
@@ -483,8 +483,7 @@ RUN set -ex \
 ENV PATH "/usr/local/bin/sbt/bin:$PATH"
 RUN sbt version -Dsbt.rootdir=true
 # Cleanup
-RUN rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    && apt-get clean
+RUN rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* && apt-get clean && apt-get update
 #****************     END JAVA     ****************************************************
 
 #=======================End of stage: runtimes  =================