From a1a7b33bfe6129185e2d34c447c41112637ffd7f Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Mon, 2 Dec 2024 10:48:04 -0600 Subject: [PATCH 1/3] Use Spring Boot 3.3.6 --- config-server/Dockerfile | 2 +- eureka-server/Dockerfile | 2 +- spring-boot-admin/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config-server/Dockerfile b/config-server/Dockerfile index 19a5616..2904381 100644 --- a/config-server/Dockerfile +++ b/config-server/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch RUN curl --get https://start.spring.io/starter.zip \ -d "type=gradle-project" \ - -d "platformVersion=3.3.4" \ + -d "platformVersion=3.3.6" \ -d "jvmVersion=21" \ -d "groupId=io.steeltoe.docker" \ -d "artifactId=configserver" \ diff --git a/eureka-server/Dockerfile b/eureka-server/Dockerfile index caad5fa..af040db 100644 --- a/eureka-server/Dockerfile +++ b/eureka-server/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch RUN curl --get https://start.spring.io/starter.zip \ -d "type=gradle-project" \ - -d "platformVersion=3.3.4" \ + -d "platformVersion=3.3.6" \ -d "jvmVersion=21" \ -d "groupId=io.steeltoe.docker" \ -d "artifactId=eurekaserver" \ diff --git a/spring-boot-admin/Dockerfile b/spring-boot-admin/Dockerfile index 1f10bee..f802bc1 100644 --- a/spring-boot-admin/Dockerfile +++ b/spring-boot-admin/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch RUN curl --get https://start.spring.io/starter.zip \ -d "type=gradle-project" \ - -d "platformVersion=3.3.4" \ + -d "platformVersion=3.3.6" \ -d "jvmVersion=21" \ -d "groupId=io.steeltoe.docker" \ -d "artifactId=springbootadmin" \ From fc3e901133a9e6efe5689b7a0382666a93c716e9 Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Mon, 2 Dec 2024 10:49:05 -0600 Subject: [PATCH 2/3] Make Spring Boot Admin listen on 9099 to avoid conflict with Prometheus on 9090 --- spring-boot-admin/Dockerfile | 2 +- spring-boot-admin/README.adoc | 2 +- spring-boot-admin/patches/application.properties.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-admin/Dockerfile b/spring-boot-admin/Dockerfile index f802bc1..663b048 100644 --- a/spring-boot-admin/Dockerfile +++ b/spring-boot-admin/Dockerfile @@ -36,5 +36,5 @@ RUN mkdir output && \ FROM eclipse-temurin:21-alpine WORKDIR /springbootadmin COPY --from=build /scratch/output . -EXPOSE 9090 +EXPOSE 9099 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "springbootadmin.jar"] diff --git a/spring-boot-admin/README.adoc b/spring-boot-admin/README.adoc index a9b1f51..78d51b4 100644 --- a/spring-boot-admin/README.adoc +++ b/spring-boot-admin/README.adoc @@ -9,5 +9,5 @@ Image for SteeltoeOSS local development with https://github.com/codecentric/spri == Running ---- -$ docker run --publish 9090:9090 steeltoeoss/spring-boot-admin +$ docker run --publish 9099:9099 steeltoeoss/spring-boot-admin ---- diff --git a/spring-boot-admin/patches/application.properties.patch b/spring-boot-admin/patches/application.properties.patch index 79cf24e..caabce5 100644 --- a/spring-boot-admin/patches/application.properties.patch +++ b/spring-boot-admin/patches/application.properties.patch @@ -3,4 +3,4 @@ @@ -1 +1,2 @@ -spring.application.name=demo +spring.application.name=SpringBootAdmin -+server.port=9090 ++server.port=9099 From e232912cba993e160e41bf29623063dcf6e322af Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Mon, 2 Dec 2024 15:35:36 -0600 Subject: [PATCH 3/3] fix some initializr params, reduce patch count --- config-server/Dockerfile | 24 ++++++++++++---------- config-server/patches/version.patch | 15 -------------- eureka-server/Dockerfile | 24 ++++++++++++---------- eureka-server/patches/version.patch | 15 -------------- spring-boot-admin/Dockerfile | 26 +++++++++++++----------- spring-boot-admin/metadata/IMAGE_VERSION | 2 +- spring-boot-admin/patches/version.patch | 15 -------------- 7 files changed, 41 insertions(+), 80 deletions(-) delete mode 100644 config-server/patches/version.patch delete mode 100644 eureka-server/patches/version.patch delete mode 100644 spring-boot-admin/patches/version.patch diff --git a/config-server/Dockerfile b/config-server/Dockerfile index 2904381..62ed028 100644 --- a/config-server/Dockerfile +++ b/config-server/Dockerfile @@ -1,24 +1,26 @@ # ----------------------------------------------------------------------------- # Spring Config Server Build # ----------------------------------------------------------------------------- +ARG JVM=21 -FROM eclipse-temurin:21-alpine AS build +FROM eclipse-temurin:$JVM-alpine AS build +ARG JVM WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch RUN curl --get https://start.spring.io/starter.zip \ - -d "type=gradle-project" \ - -d "platformVersion=3.3.6" \ - -d "jvmVersion=21" \ - -d "groupId=io.steeltoe.docker" \ - -d "artifactId=configserver" \ - -d "applicationName=ConfigServer" \ - -d "language=java" \ - -d "dependencies=cloud-config-server,actuator,cloud-eureka" \ + -d type=gradle-project \ + -d bootVersion=3.3.6 \ + -d javaVersion=$JVM \ + -d groupId=io.steeltoe.docker \ + -d artifactId=configserver \ + -d applicationName=ConfigServer \ + -d language=java \ + -d dependencies=cloud-config-server,actuator,cloud-eureka \ + -d version=4.1.3 \ --output configserver.zip RUN mkdir configserver && unzip -d configserver configserver.zip COPY metadata metadata COPY patches patches -RUN sed -i "s//$(cat metadata/IMAGE_VERSION)/g" patches/version.patch RUN for patch in patches/*.patch; do \ echo "applying patch $(basename $patch)"; \ cd configserver; \ @@ -34,7 +36,7 @@ RUN mkdir output && \ # Spring Config Server Linux Image # ----------------------------------------------------------------------------- -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:$JVM-alpine WORKDIR /config-server COPY --from=build /scratch/output . EXPOSE 8888 diff --git a/config-server/patches/version.patch b/config-server/patches/version.patch deleted file mode 100644 index aa1e479..0000000 --- a/config-server/patches/version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- configserver/build.gradle 2024-02-21 09:39:40.000000000 -0600 -+++ configserver/build.gradle 2024-02-21 11:03:17.615054116 -0600 -@@ -5,11 +5,11 @@ - } - - group = 'io.steeltoe.docker' --version = '0.0.1-SNAPSHOT' -+version = '' - - java { - toolchain { -- languageVersion = JavaLanguageVersion.of(17) -+ languageVersion = JavaLanguageVersion.of(21) - } - } diff --git a/eureka-server/Dockerfile b/eureka-server/Dockerfile index af040db..8023419 100644 --- a/eureka-server/Dockerfile +++ b/eureka-server/Dockerfile @@ -1,24 +1,26 @@ # ----------------------------------------------------------------------------- # Netflix Eureka Server Build # ----------------------------------------------------------------------------- +ARG JVM=21 -FROM eclipse-temurin:21-alpine AS build +FROM eclipse-temurin:$JVM-alpine AS build +ARG JVM WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch RUN curl --get https://start.spring.io/starter.zip \ - -d "type=gradle-project" \ - -d "platformVersion=3.3.6" \ - -d "jvmVersion=21" \ - -d "groupId=io.steeltoe.docker" \ - -d "artifactId=eurekaserver" \ - -d "applicationName=EurekaServer" \ - -d "language=java" \ - -d "dependencies=cloud-eureka-server,actuator" \ + -d type=gradle-project \ + -d bootVersion=3.3.6 \ + -d javaVersion=$JVM \ + -d groupId=io.steeltoe.docker \ + -d artifactId=eurekaserver \ + -d applicationName=EurekaServer \ + -d language=java \ + -d dependencies=cloud-eureka-server,actuator \ + -d version=4.1.3 \ --output eurekaserver.zip RUN mkdir eurekaserver && unzip -d eurekaserver eurekaserver.zip COPY metadata metadata COPY patches patches -RUN sed -i "s//$(cat metadata/IMAGE_VERSION)/g" patches/version.patch RUN for patch in patches/*.patch; do \ echo "applying patch $(basename $patch)"; \ cd eurekaserver; \ @@ -33,7 +35,7 @@ RUN mkdir output && \ # Netflix Eureka Server Linux Image # ----------------------------------------------------------------------------- -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:$JVM-alpine WORKDIR /eureka-server COPY --from=build /scratch/output . EXPOSE 8761 diff --git a/eureka-server/patches/version.patch b/eureka-server/patches/version.patch deleted file mode 100644 index 1e90bbf..0000000 --- a/eureka-server/patches/version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- eurekaserver/build.gradle 2024-02-21 15:44:45.075409600 -0600 -+++ eurekaserver/build.gradle 2024-02-21 15:43:09.000000000 -0600 -@@ -5,11 +5,11 @@ - } - - group = 'io.steeltoe.docker' --version = '0.0.1-SNAPSHOT' -+version = '' - - java { - toolchain { -- languageVersion = JavaLanguageVersion.of(17) -+ languageVersion = JavaLanguageVersion.of(21) - } - } diff --git a/spring-boot-admin/Dockerfile b/spring-boot-admin/Dockerfile index 663b048..1e3d414 100644 --- a/spring-boot-admin/Dockerfile +++ b/spring-boot-admin/Dockerfile @@ -1,24 +1,26 @@ # ----------------------------------------------------------------------------- # Spring Boot Admin Server Build # ----------------------------------------------------------------------------- +ARG JVM=21 -FROM eclipse-temurin:21-alpine AS build +FROM eclipse-temurin:$JVM-alpine AS build +ARG JVM WORKDIR /scratch RUN apk update && apk add ca-certificates && apk add curl && apk add patch -RUN curl --get https://start.spring.io/starter.zip \ - -d "type=gradle-project" \ - -d "platformVersion=3.3.6" \ - -d "jvmVersion=21" \ - -d "groupId=io.steeltoe.docker" \ - -d "artifactId=springbootadmin" \ - -d "applicationName=SpringBootAdmin" \ - -d "language=java" \ - -d "dependencies=codecentric-spring-boot-admin-server" \ +RUN curl https://start.spring.io/starter.zip \ + -d type=gradle-project \ + -d bootVersion=3.3.6 \ + -d javaVersion=$JVM \ + -d groupId=io.steeltoe.docker \ + -d artifactId=springbootadmin \ + -d applicationName=SpringBootAdmin \ + -d language=java \ + -d dependencies=codecentric-spring-boot-admin-server \ + -d version=3.3.6 \ --output springbootadmin.zip RUN mkdir springbootadmin && unzip -d springbootadmin springbootadmin.zip COPY metadata metadata COPY patches patches -RUN sed -i "s//$(cat metadata/IMAGE_VERSION)/g" patches/version.patch RUN for patch in patches/*.patch; do \ echo "applying patch $(basename $patch)"; \ cd springbootadmin; \ @@ -33,7 +35,7 @@ RUN mkdir output && \ # Spring Boot Admin Server Linux Image # ----------------------------------------------------------------------------- -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:$JVM-alpine WORKDIR /springbootadmin COPY --from=build /scratch/output . EXPOSE 9099 diff --git a/spring-boot-admin/metadata/IMAGE_VERSION b/spring-boot-admin/metadata/IMAGE_VERSION index 619b537..9c25013 100644 --- a/spring-boot-admin/metadata/IMAGE_VERSION +++ b/spring-boot-admin/metadata/IMAGE_VERSION @@ -1 +1 @@ -3.3.3 +3.3.6 diff --git a/spring-boot-admin/patches/version.patch b/spring-boot-admin/patches/version.patch deleted file mode 100644 index de18c31..0000000 --- a/spring-boot-admin/patches/version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./build.gradle 2024-09-20 12:37:35.000000000 -0500 -+++ ./build.gradle 2024-09-20 12:39:57.439918218 -0500 -@@ -5,11 +5,11 @@ - } - - group = 'io.steeltoe.docker' --version = '0.0.1-SNAPSHOT' -+version = '' - - java { - toolchain { -- languageVersion = JavaLanguageVersion.of(17) -+ languageVersion = JavaLanguageVersion.of(21) - } - }