Update Config & Eureka Server dependencies

Also: move from HTTPIE to CURL and append "-pr" to image name during PR builds
SteeltoeOSS · Sep 25, 2024 · 95e050a · 95e050a
1 parent cf06553
commit 95e050a
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 32 deletions.
diff --git a/.github/workflows/build_config_server.yaml b/.github/workflows/build_config_server.yaml
@@ -20,8 +20,8 @@ permissions:
   contents: 'read'
 
 env:
-  IMAGE_NAME: config-server
-  REGISTRY: ${{ github.event_name == 'pull_request' && vars.DOCKER_REGISTRY || 'steeltoeoss' }}
+  IMAGE_NAME: ${{ github.event_name == 'pull_request' && 'config-server-pr' || 'config-server' }}
+  REGISTRY: ${{ vars.DOCKER_REGISTRY }}
 
 jobs:
   build-push:

diff --git a/.github/workflows/build_eureka_server.yaml b/.github/workflows/build_eureka_server.yaml
@@ -20,8 +20,8 @@ permissions:
   contents: 'read'
 
 env:
-  IMAGE_NAME: eureka-server
-  REGISTRY: ${{ github.event_name == 'pull_request' && vars.DOCKER_REGISTRY || 'steeltoeoss' }}
+  IMAGE_NAME: ${{ github.event_name == 'pull_request' && 'eureka-server-pr' || 'eureka-server' }}
+  REGISTRY: ${{ vars.DOCKER_REGISTRY }}
 
 jobs:
   build-push:

diff --git a/config-server/Dockerfile b/config-server/Dockerfile
@@ -2,18 +2,18 @@
 # Spring Config Server Build
 # -----------------------------------------------------------------------------
 
-FROM eclipse-temurin:21-alpine as build
+FROM eclipse-temurin:21-alpine AS build
 WORKDIR /scratch
-RUN apk add httpie && apk add patch
-RUN http https://start.spring.io/starter.zip \
-        type==gradle-project \
-        platformVersion==3.2.4 \
-        jvmVersion==21 \
-        groupId==io.steeltoe.docker \
-        artifactId==configserver \
-        applicationName==ConfigServer \
-        language==java \
-        dependencies==cloud-config-server,actuator,cloud-eureka \
+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" \
         --output configserver.zip
 RUN mkdir configserver && unzip -d configserver configserver.zip
 COPY metadata metadata

diff --git a/config-server/metadata/IMAGE_VERSION b/config-server/metadata/IMAGE_VERSION
@@ -1 +1 @@
-4.1.1
+4.1.3
diff --git a/config-server/patches/version.patch b/config-server/patches/version.patch
@@ -1,11 +1,15 @@
 --- configserver/build.gradle	2024-02-21 09:39:40.000000000 -0600
 +++ configserver/build.gradle	2024-02-21 11:03:17.615054116 -0600
-@@ -5,7 +5,7 @@
+@@ -5,11 +5,11 @@
  }
 
  group = 'io.steeltoe.docker'
 -version = '0.0.1-SNAPSHOT'
 +version = '<VERSION>'
 
  java {
- 	sourceCompatibility = '17'
+ 	toolchain {
+-		languageVersion = JavaLanguageVersion.of(17)
++		languageVersion = JavaLanguageVersion.of(21)
+ 	}
+ }
diff --git a/eureka-server/Dockerfile b/eureka-server/Dockerfile
@@ -2,18 +2,18 @@
 # Netflix Eureka Server Build
 # -----------------------------------------------------------------------------
 
-FROM eclipse-temurin:21-alpine as build
+FROM eclipse-temurin:21-alpine AS build
 WORKDIR /scratch
-RUN apk add httpie && apk add patch
-RUN http https://start.spring.io/starter.zip \
-        type==gradle-project \
-        platformVersion==3.2.4 \
-        jvmVersion==21 \
-        groupId==io.steeltoe.docker \
-        artifactId==eurekaserver \
-        applicationName==EurekaServer \
-        language==java \
-        dependencies==cloud-eureka-server,actuator \
+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" \
         --output eurekaserver.zip
 RUN mkdir eurekaserver && unzip -d eurekaserver eurekaserver.zip
 COPY metadata metadata

diff --git a/eureka-server/metadata/IMAGE_VERSION b/eureka-server/metadata/IMAGE_VERSION
@@ -1 +1 @@
-4.1.1
+4.1.3
diff --git a/eureka-server/patches/version.patch b/eureka-server/patches/version.patch
@@ -1,11 +1,15 @@
 --- eurekaserver/build.gradle	2024-02-21 15:44:45.075409600 -0600
 +++ eurekaserver/build.gradle	2024-02-21 15:43:09.000000000 -0600
-@@ -5,7 +5,7 @@
+@@ -5,11 +5,11 @@
  }
 
  group = 'io.steeltoe.docker'
 -version = '0.0.1-SNAPSHOT'
 +version = '<VERSION>'
 
  java {
- 	sourceCompatibility = '17'
+ 	toolchain {
+-		languageVersion = JavaLanguageVersion.of(17)
++		languageVersion = JavaLanguageVersion.of(21)
+ 	}
+ }