From 3fab7e3a58b76c010ec0181b9341e79fc8aff35c Mon Sep 17 00:00:00 2001
From: Gaofei Zhao <15748980+dippindots@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:49:26 -0400
Subject: [PATCH] Update java image to amazoncorretto

---
 .circleci/config.yml           | 2 +-
 docker/web-and-data/Dockerfile | 4 ++--
 docker/web/Dockerfile          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2c7f2c1465..3b07f618baa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2
 jobs:
     build_backend:
         docker:
-            - image: maven:3-eclipse-temurin-21
+            - image: maven:3-amazoncorretto-21
         working_directory: /tmp/repos/cbioportal
         steps:
             - checkout
diff --git a/docker/web-and-data/Dockerfile b/docker/web-and-data/Dockerfile
index c8658f23fac..1e9f134cea3 100644
--- a/docker/web-and-data/Dockerfile
+++ b/docker/web-and-data/Dockerfile
@@ -11,7 +11,7 @@
 # NOTE: the .git folder is included in the build stage, but excluded 
 # from the final image. No confidential information is exposed.
 # (see: stackoverflow.com/questions/56278325)
-FROM maven:3-eclipse-temurin-21 as build
+FROM maven:3-amazoncorretto-21 as build
 
 # download maven dependencies first to take advantage of docker caching
 COPY pom.xml                                        /cbioportal/
@@ -26,7 +26,7 @@ COPY $PWD /cbioportal
 RUN mvn install package -DskipTests -q
 RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*-exec.jar)
 
-FROM eclipse-temurin:21
+FROM amazoncorretto:21
 
 # download system dependencies first to take advantage of docker caching
 RUN apt-get update; apt-get install -y --no-install-recommends \
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
index 8e1bccaf32c..dcd2c3c6e3c 100644
--- a/docker/web/Dockerfile
+++ b/docker/web/Dockerfile
@@ -13,13 +13,13 @@
 #
 # WARNING: the shendoah image is a nightly, untested, experimental build. If
 # you want to use an official openjdk image instead use the web-and-data image.
-FROM maven:3-eclipse-temurin-21 as build
+FROM maven:3-amazoncorretto-21 as build
 COPY $PWD /cbioportal
 WORKDIR /cbioportal
 ARG MAVEN_OPTS=-DskipTests
 # Use quite output so we can see the build steps easily
 RUN mvn ${MAVEN_OPTS} clean install -q
-FROM eclipse-temurin:21
+FROM amazoncorretto:21
 
 ENV PORTAL_WEB_HOME=/cbioportal-webapp
 RUN mkdir -p $PORTAL_WEB_HOME