lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[#1740] Migrate to Spring Boot 3.3.0 (#1743)

Browse Source 
1. Migrate Spring Boot to 3.3.0
2. Upgrade some other dependencies
3. Update Dockerfile-s regarding deprecated -Djarmode=layertools extract

Follow: [Spring Boot 3.3 Release Notes](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.3-Release-Notes)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-06-06 10:43:11 +03:00
committed by GitHub
parent a6a2014ad3
commit 6022009525
5 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-runtime/docker/docker_build/Dockerfile
View File

@@ -21,7 +21,7 @@ RUN set -x &&\
wget -O ${APP}.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar.asc &&\
gpg --batch --verify ${APP}.jar.asc ${APP}.jar &&\
apk del build-dependencies &&\
java -Djarmode=layertools -jar ${APP}.jar extract --destination . &&\
java -Djarmode=tools -jar /${APP}.jar extract --layers --launcher --destination . &&\
rm ${APP}.jar ${APP}.jar.asc /KEY
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine

2
hawkbit-runtime/docker/docker_build/Dockerfile-mysql
View File

@@ -20,7 +20,7 @@ RUN set -x &&\
wget -O ${APP}.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar &&\
wget -O ${APP}.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar.asc &&\
gpg --batch --verify ${APP}.jar.asc ${APP}.jar &&\
java -Djarmode=layertools -jar ${APP}.jar extract --destination . &&\
java -Djarmode=tools -jar /${APP}.jar extract --layers --launcher --destination . &&\
rm ${APP}.jar ${APP}.jar.asc /KEY
ARG MARIADB_DRIVER_VERSION=3.1.4

2
hawkbit-runtime/docker/docker_build/Dockerfile_dev
View File

@@ -15,7 +15,7 @@ COPY org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar ${APP}-${VERSIO
RUN set -x &&\
mkdir -p ${BUILD_DIR} &&\
cd ${BUILD_DIR} &&\
java -Djarmode=layertools -jar /${APP}-${VERSION}.jar extract --destination . &&\
java -Djarmode=tools -jar /${APP}-${VERSION}.jar extract --layers --launcher --destination . &&\
rm /${APP}-${VERSION}.jar
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine

2
hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
View File

@@ -15,7 +15,7 @@ COPY org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar ${APP}-${VERSIO
RUN set -x &&\
mkdir -p ${BUILD_DIR} &&\
cd ${BUILD_DIR} &&\
java -Djarmode=layertools -jar /${APP}-${VERSION}.jar extract --destination . &&\
java -Djarmode=tools -jar /${APP}-${VERSION}.jar extract --layers --launcher --destination . &&\
rm /${APP}-${VERSION}.jar
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine