diff --git a/breath-of-the-wild-multiplayer/create.sh b/breath-of-the-wild-multiplayer/create.sh old mode 100644 new mode 100755 diff --git a/minecraft/forge/Dockerfile b/minecraft/forge/Dockerfile index cca9086..79d0f53 100644 --- a/minecraft/forge/Dockerfile +++ b/minecraft/forge/Dockerfile @@ -9,6 +9,6 @@ COPY eula.txt . RUN adduser -S minecraft minecraft RUN chown -R minecraft /opt/server && chown -R root /opt/server/libraries /opt/server/run.sh /opt/server/user_jvm_args.txt USER minecraft -EXPOSE 25565 +EXPOSE 25565/tcp ENTRYPOINT [ "/opt/server/run.sh" ] LABEL type=GAME diff --git a/minecraft/forge/OldDockerfile b/minecraft/forge/OldDockerfile new file mode 100644 index 0000000..fc19d7f --- /dev/null +++ b/minecraft/forge/OldDockerfile @@ -0,0 +1,15 @@ +FROM alpine +ARG VERSION=1.20.2 +RUN apk update && apk add openjdk8 wget +RUN mkdir -p /opt/server +WORKDIR /opt/server +COPY forge-${VERSION}-installer.jar /opt +RUN java -jar /opt/forge-${VERSION}-installer.jar --installServer . +COPY eula.txt . +RUN rm forge*installer* && mv forge*.jar forge-server.jar +# RUN adduser -S minecraft minecraft +# RUN chown -R minecraft /opt/server && chown -R root /opt/server/libraries +# USER minecraft +EXPOSE 25565/tcp +ENTRYPOINT [ "java", "-jar", "forge-server.jar", "--nogui"] +LABEL type=GAME diff --git a/minecraft/forge/create.sh b/minecraft/forge/create.sh index 2670354..8646c5a 100755 --- a/minecraft/forge/create.sh +++ b/minecraft/forge/create.sh @@ -1,6 +1,15 @@ #!/bin/sh +vercomp(){ + local a b IFS=. -; set -f + printf -v a %08d $1; printf -v b %08d $3 + test $a "$2" $b +} if [[ -z $VERSION ]] ; then VERSION=1.20.2; fi; -docker build -t "minecraft:forge-$VERSION" . --build-arg VERSION=$VERSION +if vercomp $VERSION \< 1.13.0; then + docker build -f OldDockerfile -t "minecraft:forge-$VERSION" . --build-arg VERSION=$VERSION +else + docker build -t "minecraft:forge-$VERSION" . --build-arg VERSION=$VERSION +fi diff --git a/minecraft/forge/forge-1.12.2-installer.jar b/minecraft/forge/forge-1.12.2-installer.jar new file mode 100644 index 0000000..f19f657 --- /dev/null +++ b/minecraft/forge/forge-1.12.2-installer.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea7c33ba95e3993a98d0e9e38168c0759ec323a18675a71d938e1f3f70e6e8e7 +size 4681950 diff --git a/steam/palworld/create.sh b/steam/palworld/create.sh index 420cd26..70b50fe 100755 --- a/steam/palworld/create.sh +++ b/steam/palworld/create.sh @@ -1,2 +1,2 @@ #!/bin/zsh -docker build --label type=GAME -t palworld:latest . +docker build --label type=GAME -t palworld:latest . $@