Skip to content

Commit

Permalink
Get docker image fully working
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexProgrammerDE committed Mar 12, 2024
1 parent 01ca2a6 commit e2edf6d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Expand Up @@ -20,7 +20,6 @@ hs_err_pid*
/bin
/dist
/manifest.mf
*.log

# Mac filesystem dust
.DS_Store
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile
Expand Up @@ -6,7 +6,7 @@ COPY --chown=root:root . /soulfire
# Build soulfire
WORKDIR /soulfire
RUN --mount=type=cache,target=/root/.gradle,sharing=locked --mount=type=cache,target=/soulfire/.gradle,sharing=locked --mount=type=cache,target=/soulfire/work,sharing=locked \
./gradlew build --stacktrace
./gradlew :dedicated:build --stacktrace

FROM eclipse-temurin:21-jdk-alpine AS jre-no-javac-builder

Expand Down Expand Up @@ -37,14 +37,16 @@ ENV JAVA_HOME=/opt/java/openjdk \

# Copy over JRE
COPY --from=jre-no-javac-builder --chown=soulfire:soulfire /soulfire/java $JAVA_HOME
COPY --from=soulfire-builder --chown=soulfire:soulfire /soulfire/build/libs/SoulFire-*.jar /soulfire/soulfire.jar
COPY --from=soulfire-builder --chown=soulfire:soulfire /soulfire/dedicated/build/libs/SoulFireDedicated-*.jar /soulfire/soulfire.jar

# Use the soulfire's home directory as our work directory
WORKDIR /soulfire

# Switch from root to soulfire
USER soulfire

EXPOSE 38765/tcp

# Start the process using dumb-init
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/soulfire/java/bin/java", "-jar", "/soulfire/soulfire.jar"]
CMD ["/opt/java/openjdk/bin/java", "-jar", "/soulfire/soulfire.jar"]

0 comments on commit e2edf6d

Please sign in to comment.