Skip to content

Commit 369f4f0

Browse files
committed
🔧 chore(build): update surfDatabaseR2dbc version to 2.3.2 and increment project version to 2.4.11
- change surfDatabaseR2dbc version from 2.3.1 to 2.3.2 in build.gradle.kts - update project version from 2.4.10 to 2.4.11 in gradle.properties - add command-client-build stage to Dockerfile for microservicectl - copy microservicectl binary to Docker image
1 parent 13da949 commit 369f4f0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
kotlin.stdlib.default.dependency=false
33
org.gradle.parallel=true
4-
version=2.4.10
4+
version=2.4.11

‎surf-core-microservice/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ FROM eclipse-temurin:25-jdk AS build
44
WORKDIR /workspace
55
COPY . .
66
RUN chmod +x gradlew && ./gradlew :surf-core-microservice:prepareMicroserviceDockerArtifact --no-daemon
7+
FROM golang:1.26-alpine AS command-client-build
8+
WORKDIR /src
9+
COPY --from=build /workspace/surf-core-microservice/build/generated/microservicectl/main.go /src/main.go
10+
RUN mkdir -p /out && CGO_ENABLED=0 go build -buildvcs=false -trimpath -ldflags='-s -w' -o /out/microservicectl /src/main.go
711
FROM eclipse-temurin:25-jre
812
RUN groupadd --system --gid 10001 app && useradd --system --uid 10001 --gid app --home-dir /app --create-home app
913
WORKDIR /app
1014
COPY --from=build --chown=app:app /workspace/surf-core-microservice/build/docker/app.jar /app/app.jar
15+
COPY --from=command-client-build /out/microservicectl /usr/local/bin/microservicectl
1116
ENV JAVA_OPTS=""
1217
ENV SURF_MICROSERVICE_COMMAND_SOCKET=/app/run/microservice.sock
1318
#
@@ -43,10 +48,5 @@ ENV SURF_MICROSERVICE_COMMAND_SOCKET=/app/run/microservice.sock
4348
# - SURF_DATABASE_POOL_MAX_VALIDATION_TIME_MILLIS: maximum validation time in milliseconds
4449
# - SURF_DATABASE_POOL_MAX_IDLE_TIME_MILLIS: maximum idle time in milliseconds
4550
# - SURF_DATABASE_POOL_MAX_LIFE_TIME_MILLIS: maximum connection lifetime in milliseconds
46-
RUN printf '%s\n' \
47-
'#!/bin/sh' \
48-
'exec java -Xms8m -Xmx64m -XX:+ExitOnOutOfMemoryError -jar /app/app.jar __surf-command "$@"' \
49-
> /usr/local/bin/microservicectl \
50-
&& chmod 0555 /usr/local/bin/microservicectl
5151
USER app
5252
ENTRYPOINT ["sh", "-c", "exec java -XX:MaxRAMPercentage=75.0 -XX:+ExitOnOutOfMemoryError $JAVA_OPTS -jar /app/app.jar \"$@\"", "--"]

‎surf-core-microservice/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
}
1111

1212
surfStandaloneApi {
13-
withSurfDatabaseR2dbc("2.3.1", "dev.slne.surf.core.libs.database")
13+
withSurfDatabaseR2dbc("2.3.2", "dev.slne.surf.core.libs.database")
1414
}
1515

1616
surfMicroservice {

0 commit comments

Comments
 (0)