Compare commits
8 Commits
1999a0c0d0
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| bed8684352 | |||
| 58e34860fd | |||
| 8d2c901978 | |||
| 07c8bfd165 | |||
| 30802403cc | |||
| bdbcebf366 | |||
| e48fa26b5a | |||
| e057c808a8 |
13
Dockerfile
13
Dockerfile
@@ -3,6 +3,11 @@ ARG MINECRAFT_VERSION="1.16.5"
|
||||
ARG FORGE_VERSION="36.2.26"
|
||||
ARG JRE_VERSION="openjdk8-jre"
|
||||
|
||||
ARG UID=1520
|
||||
ARG USER=minecraft
|
||||
ARG GID=1520
|
||||
ARG GROUP=minecraft
|
||||
|
||||
# The first stage just builds up the modpack
|
||||
FROM alpine:latest AS build
|
||||
|
||||
@@ -26,10 +31,18 @@ FROM alpine:latest AS final
|
||||
|
||||
# Use only a subset of arguments
|
||||
ARG JRE_VERSION
|
||||
ARG UID
|
||||
ARG USER
|
||||
ARG GID
|
||||
ARG GROUP
|
||||
|
||||
# Build the thing up
|
||||
RUN apk add bash curl findutils rsync screen "${JRE_VERSION}"
|
||||
WORKDIR /minecraft
|
||||
COPY --from=build /minecraft .
|
||||
RUN addgroup -g "${GID}" "${GROUP}" && \
|
||||
adduser -h /minecraft -s /bin/sh -D -H -u "${UID}" -G "${GROUP}" "${USER}" && \
|
||||
chown "${USER}:${GROUP}" /minecraft
|
||||
USER $USER
|
||||
CMD [ "bash", "start-server.sh" ]
|
||||
EXPOSE 25565
|
||||
|
||||
2
build.sh
2
build.sh
@@ -32,7 +32,7 @@ for mc in ${mcversions[@]}; do
|
||||
jre="${jreversions[$mc]}"
|
||||
CI_HUB_USERNAME="${CI_HUB_USERNAME:=rehashedsalt}"
|
||||
CI_PROJECT_NAME="${CI_PROJECT_NAME:=minecraft-forge}"
|
||||
tag="$CI_HUB_USERNAME/$CI_PROJECT_NAME:$mc-$forge-$jre-${CI_COMMIT_REF_NAME:=bleeding}"
|
||||
tag="$CI_HUB_USERNAME/$CI_PROJECT_NAME:$mc-${CI_COMMIT_REF_NAME:=bleeding}"
|
||||
echo "Building image..."
|
||||
echo " Minecraft: $mc"
|
||||
echo " Forge: $forge"
|
||||
|
||||
@@ -22,7 +22,7 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
|
||||
echo "Found modpack directory: $directory"
|
||||
fi
|
||||
echo "Syncing content to /minecraft"
|
||||
rsync --ignore-existing "$directory"/ /minecraft/
|
||||
rsync --no-perms --no-owner --no-group --ignore-existing "$directory"/ /minecraft/
|
||||
popd > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user