Skip to content

Commit e3da498

Browse files
author
wlanboy
committed
Upgrade to Spring Boot 3.5.9, removed build args
1 parent cb80c03 commit e3da498

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

.github/workflows/dockerpublish

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
tags:
55
- '*d'
6+
workflow_dispatch:
67
jobs:
78
build:
89
runs-on: ubuntu-latest
@@ -23,6 +24,6 @@ jobs:
2324
run: |
2425
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
2526
- name: Build the Docker image
26-
run: docker build -t wlanboy/javahttpclient:latest . --build-arg JAR_FILE=./target/javahttpclient-0.0.1-SNAPSHOT.jar
27+
run: docker build -t wlanboy/javahttpclient:latest .
2728
- name: Docker Push
2829
run: docker push wlanboy/javahttpclient:latest

.github/workflows/dockerpublishmanual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
run: |
2929
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
3030
- name: Build the Docker image
31-
run: docker build -t wlanboy/javahttpclient:latest . --build-arg JAR_FILE=./target/javahttpclient-0.0.1-SNAPSHOT.jar
31+
run: docker build -t wlanboy/javahttpclient:latest .
3232
- name: Docker Push
3333
run: docker push wlanboy/javahttpclient:latest

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
FROM eclipse-temurin:21-jre-noble
22
VOLUME /tmp
3-
ARG JAR_FILE
4-
ADD ${JAR_FILE} app.jar
3+
4+
WORKDIR /app
5+
ADD target/javahttpclient-0.0.1-SNAPSHOT.jar /app/javahttpclient.jar
6+
57
EXPOSE 8080
6-
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
8+
9+
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/javahttpclient.jar", "--spring.config.location=file:/app/application.properties"]

application.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Endpoints
2+
management.endpoints.web.exposure.include=prometheus,health,info,metric
3+
management.endpoint.health.show-details=always
4+
# Buildinfo
5+
spring.config.import=classpath:META-INF/build-info.properties
6+
# Tracing
7+
spring.sleuth.propagation.type=w3c,b3

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.8</version>
9+
<version>3.5.9</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

@@ -40,10 +40,12 @@
4040
<groupId>org.springframework.boot</groupId>
4141
<artifactId>spring-boot-starter-actuator</artifactId>
4242
</dependency>
43+
44+
<!--https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui-->
4345
<dependency>
4446
<groupId>org.springdoc</groupId>
4547
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
46-
<version>2.8.3</version>
48+
<version>2.8.14</version>
4749
</dependency>
4850

4951
<dependency>

0 commit comments

Comments
 (0)