Merge branch 'master' into alpine

This commit is contained in:
Geoff Bourne
2017-02-22 13:16:38 -06:00
committed by GitHub
13 changed files with 293 additions and 44 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
FROM alpine
MAINTAINER itzg
RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\
@@ -39,6 +40,6 @@ ENTRYPOINT [ "/start" ]
ENV UID=1000 GID=1000 \
MOTD="A Minecraft Server Powered by Docker" \
JVM_OPTS="-Xmx1024M -Xms1024M" \
JVM_XX_OPTS="-XX:+UseG1GC" MAX_MEMORY="1G" \
TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \
LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE CONSOLE=true