PR feedback

- use metadata/IMAGE_VERSION as source of truth, also read it in fewer places
- use lazy-initialization in eureka to improve start time

Author: TimHess

README.md

@@ -27,7 +27,7 @@ See [Common Tasks](https://github.com/SteeltoeOSS/Samples/blob/main/CommonTasks.
 | [steeltoe.azurecr.io/config-server](config-server/) | Spring Cloud Config Server |
 | [steeltoe.azurecr.io/eureka-server](eureka-server/) | Netflix Eureka Server |
 | [steeltoe.azurecr.io/spring-boot-admin](spring-boot-admin/) | Spring Boot Admin |
-| [steeltoe.azurecr.io/uaa-server](uaa-server/) | CloudFoundry UAA Server |
+| [steeltoe.azurecr.io/uaa-server](uaa-server/) | Cloud Foundry UAA Server |
 
 ## Debug Image Building
 

native-build.sh build-with-gradle.shnative-build.sh renamed to build-with-gradle.sh

@@ -1,38 +1,37 @@
 #!/bin/bash
 
 # This script essentially does what ./build.ps1 + the dockerfiles do, but without building container images.
-# Use this script if you need to troubleshoot or do something new with the servers that get embedded in the images
+# Use this script if you need to troubleshoot or do something new with the servers that get embedded in the images.
 
 if [ "$#" -eq 0 ]
 then
     echo "You must specify the server to build. Supported options include config-server, eureka-server and spring-boot-admin."
     exit 1
 fi
 
-JVM="21"
-bootVersion="3.5.6"
-
 if [ "$1" == "config-server" ]; then
     appName="ConfigServer"
-    serverVersion="4.3.0"
     dependencies="cloud-config-server,actuator,cloud-eureka,security"
 elif [ "$1" == "eureka-server" ]; then
     appName="EurekaServer"
-    serverVersion="4.3.0"
     dependencies="cloud-eureka-server,actuator"
 elif [ "$1" == "spring-boot-admin" ]; then
     appName="SpringBootAdmin"
-    serverVersion="3.5.5"
     dependencies="codecentric-spring-boot-admin-server"
 else
     echo "$1 is not currently supported by this script"
     exit 2
 fi
+
 sourceDirectory=$1
 serverName=${sourceDirectory//-/}
 tempDir="$serverName-temp"
+JVM="21"
+bootVersion="3.5.6"
+serverVersion="$(cat $sourceDirectory/metadata/IMAGE_VERSION)"
+
+echo "From source: $sourceDirectory | Building server: $serverName@$serverVersion | In temp directory: $tempDir"
 
-echo "Source: $sourceDirectory | Server: $serverName | TempDir: $tempDir"
 rm -rf $tempDir
 mkdir $tempDir
 cd $tempDir
@@ -61,8 +60,8 @@ for patch in patches/*.patch; do \
         cd ..; \
         done
 
-$serverName/gradlew bootJar --project-dir $serverName
-mkdir output
-cp $serverName/build/libs/$serverName-$(cat metadata/IMAGE_VERSION).jar output/$serverName.jar
+cd $serverName
+./gradlew bootBuildImage --imageName="steeltoe.azurecr.io/$sourceDirectory:$serverVersion"
+cd ..
 
 cd ..

build.ps1

@@ -126,6 +126,6 @@ else
     Write-Host "Tag value set by script parameter:" $Tag
 }
 
-$docker_command = "docker build $Tag $ImageDirectory"
+$docker_command = "docker build $Tag $ImageDirectory --build-arg SERVER_VERSION=$Version"
 Write-Host $docker_command
 Invoke-Expression $docker_command

config-server/Dockerfile

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 ARG JVM=21
 ARG BOOT_VERSION=3.5.6
-# When changing, make sure this aligns with metadata/IMAGE_VERSION
-ARG SERVER_VERSION=4.3.0
 
 FROM eclipse-temurin:$JVM-alpine AS build
 ARG JVM
@@ -34,7 +32,7 @@ RUN for patch in patches/*.patch; do \
         done
 RUN configserver/gradlew bootJar --project-dir configserver --no-daemon
 RUN mkdir output && \
-    cp "configserver/build/libs/configserver-$(cat metadata/IMAGE_VERSION).jar" output/configserver.jar && \
+    cp "configserver/build/libs/configserver-$SERVER_VERSION.jar" output/configserver.jar && \
     cp configserver/src/main/resources/application.properties output/application.properties
 
 # -----------------------------------------------------------------------------

eureka-server/Dockerfile

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 ARG JVM=21
 ARG BOOT_VERSION=3.5.6
-# When changing, make sure this aligns with metadata/IMAGE_VERSION
-ARG SERVER_VERSION=4.3.0
 
 FROM eclipse-temurin:$JVM-alpine AS build
 ARG JVM
@@ -34,7 +32,7 @@ RUN for patch in patches/*.patch; do \
         done
 RUN eurekaserver/gradlew bootJar --project-dir eurekaserver --no-daemon
 RUN mkdir output && \
-    cp "eurekaserver/build/libs/eurekaserver-$(cat metadata/IMAGE_VERSION).jar" output/eurekaserver.jar
+    cp "eurekaserver/build/libs/eurekaserver-$SERVER_VERSION.jar" output/eurekaserver.jar
 
 # -----------------------------------------------------------------------------
 # Netflix Eureka Server Linux Image

eureka-server/patches/application.properties.patch

@@ -1,6 +1,6 @@
 --- eurekaserver/src/main/resources/application.properties	2024-02-21 15:43:09.000000000 -0600
 +++ eurekaserver/src/main/resources/application.properties	2024-04-02 13:15:18.461432100 -0500
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +server.port = 8761
 +eureka.client.fetch-registry = false
 +eureka.client.register-with-eureka = false
@@ -9,3 +9,4 @@
 +eureka.server.responseCacheUpdateIntervalMs = 1000
 +eureka.server.wait-time-in-ms-when-sync-empty = 0
 +logging.level.com.netflix.eureka = TRACE
++spring.main.lazy-initialization = true

spring-boot-admin/Dockerfile

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 ARG JVM=21
 ARG BOOT_VERSION=3.5.6
-# When changing, make sure this aligns with metadata/IMAGE_VERSION
-ARG SERVER_VERSION=3.5.5
 
 FROM eclipse-temurin:$JVM-alpine AS build
 ARG JVM

uaa-server/Dockerfile

@@ -1,8 +1,8 @@
 # -----------------------------------------------------------------------------
 # UAA Server Build
 # -----------------------------------------------------------------------------
-
-FROM cfidentity/uaa:v78.3.0
+ARG SERVER_VERSION
+FROM cfidentity/uaa:v${SERVER_VERSION}
 COPY uaa.yml /uaa/uaa.yml
 COPY log4j2.properties /uaa/log4j2.properties
 ENV CLOUDFOUNDRY_CONFIG_PATH=/uaa