Skip to content

Commit 6a60e34

Browse files
committed
Fix dockerfile for new changes
1 parent 751a733 commit 6a60e34

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

Dockerfile

+9-20
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
1-
# Adapted from: https://github.com/PaperMC/bibliothek/blob/063cc014193b6ea160b3cabc7b93f70009e1fb2a/Dockerfile
2-
ARG JAVA_VERSION=17
3-
ARG JVM_FLAVOR=hotspot
4-
5-
FROM eclipse-temurin:${JAVA_VERSION}-jdk-alpine AS builder
6-
WORKDIR /build
7-
8-
COPY ./ ./
9-
RUN ./gradlew clean buildForDocker --no-daemon
10-
11-
12-
ARG JAVA_VERSION
13-
ARG JVM_FLAVOR
14-
15-
FROM eclipse-temurin:${JAVA_VERSION}-alpine
16-
WORKDIR /app
1+
FROM eclipse-temurin:17-alpine
172

183
# Install curl for the healthcheck
194
RUN apk update && apk add curl
205

216
RUN addgroup -S pingapi \
227
&& adduser -S pingapi -G pingapi \
23-
&& chown -R pingapi:pingapi /app
8+
&& chown -R pingapi:pingapi /opt/app
249
USER pingapi:pingapi
2510

11+
WORKDIR /opt/app
12+
13+
COPY build/libs/ServerPingApi.jar ServerPingApi.jar
14+
COPY ./docker/default.application.yaml ./default.application.yaml
15+
2616
EXPOSE 8080
2717

2818
# We override default config location search path,
@@ -31,7 +21,6 @@ EXPOSE 8080
3121
# but they take precedence over config file
3222
# https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html
3323
ENV SPRING_CONFIG_LOCATION="optional:classpath:/,optional:classpath:/config/,file:./default.application.yaml,optional:file:./,optional:file:./config/"
34-
COPY ./docker/default.application.yaml ./default.application.yaml
3524

3625
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s \
3726
--retries=3 CMD [ "sh", "-c", "echo -n 'curl localhost:8080... '; \
@@ -41,5 +30,5 @@ HEALTHCHECK --interval=30s --timeout=30s --start-period=5s \
4130
echo Fail && exit 2\
4231
)"]
4332

44-
COPY --from=builder /build/build/libs/docker/serverpingapi.jar ./
45-
CMD ["java", "-jar", "/app/serverpingapi.jar"]
33+
34+
CMD ["java", "-jar", "ServerPingApi.jar"]

0 commit comments

Comments
 (0)