Update dependencies and change SBA port

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.4" \
-        -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/<VERSION>/$(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

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.4" \
-        -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/<VERSION>/$(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

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.4" \
-        -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/<VERSION>/$(cat metadata/IMAGE_VERSION)/g" patches/version.patch
 RUN for patch in patches/*.patch; do \
         echo "applying patch $(basename $patch)"; \
         cd springbootadmin; \
@@ -33,8 +35,8 @@ 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 9090
+EXPOSE 9099
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "springbootadmin.jar"]

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
 ----

spring-boot-admin/metadata/IMAGE_VERSION

@@ -1 +1 @@
-3.3.3
+3.3.6

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