diff --git a/Dockerfile b/Dockerfile index 079acabe..f5c70a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ #---------------------------------- # Import docker image with maven installed -FROM maven:3.8.3-openjdk-17 as builder +FROM maven:3.9-eclipse-temurin-22 as builder # Add maintainer, so that new user will understand who had written this Dockerfile MAINTAINER Madhup Pandey @@ -25,7 +25,7 @@ RUN mvn clean install -DskipTests=true #-------------------------------------- # Import small size java image -FROM openjdk:17-alpine as deployer +FROM eclipse-temurin:22-jre-alpine as deployer # Copy build from stage 1 (builder) COPY --from=builder /src/target/*.jar /src/target/bankapp.jar diff --git a/README-K8S.md b/README-K8S.md index 7554262f..59d92d88 100644 --- a/README-K8S.md +++ b/README-K8S.md @@ -85,7 +85,14 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-17-jre -y +sudo apt install fontconfig -y + +# Install Eclipse Temurin JDK 22 (openjdk-22 is not available in Ubuntu apt repositories) +sudo apt install -y wget apt-transport-https gpg +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo gpg --dearmor -o /usr/share/keyrings/adoptium.gpg +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/adoptium.list +sudo apt update -y +sudo apt install temurin-22-jdk -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key diff --git a/README.md b/README.md index 2f49958e..01297177 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,14 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-17-jre -y +sudo apt install fontconfig -y + +# Install Eclipse Temurin JDK 22 (openjdk-22 is not available in Ubuntu apt repositories) +sudo apt install -y wget apt-transport-https gpg +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo gpg --dearmor -o /usr/share/keyrings/adoptium.gpg +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/adoptium.list +sudo apt update -y +sudo apt install temurin-22-jdk -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key diff --git a/kubernetes/bankapp-deployment.yml b/kubernetes/bankapp-deployment.yml index 45a35b6f..3343e855 100644 --- a/kubernetes/bankapp-deployment.yml +++ b/kubernetes/bankapp-deployment.yml @@ -17,7 +17,7 @@ spec: spec: containers: - name: bankapp - image: trainwithshubham/bankapp-eks:v2 + image: trainwithshubham/bankapp-eks:java22 ports: - containerPort: 8080 env: diff --git a/pom.xml b/pom.xml index fc5bfeac..e69676d0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.0 com.example @@ -27,7 +27,7 @@ - 17 + 22 @@ -80,8 +80,8 @@ maven-compiler-plugin 3.8.0 - 1.8 - 1.8 + 22 + 22