diff --git a/Dockerfile b/Dockerfile index bb1d6e1..c8584cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ FROM ubuntu:trusty +ADD start /start + RUN useradd --uid 1000 mcserver && \ apt-get update && \ - apt-get install -y openjdk-7-jre-headless supervisor && \ + apt-get install -y openjdk-7-jre-headless && \ mkdir -p /srv/spigot/ /srv/spigot-default/ && \ - chown -R mcserver:mcserver /srv/spigot/ + chown -R mcserver:mcserver /srv/spigot/ && \ + chmod +x /start ENV MEMLIMIT=1024m -ADD copyjars.sh /usr/local/bin/ ADD spigot-1.11.2.jar /srv/spigot-default/spigot.jar ADD eula.txt /srv/spigot-default/ -ADD supervisor.conf /etc/supervisor/conf.d/ -ADD spigot.conf /etc/supervisor/conf.d/ -ENTRYPOINT ["supervisord"] +ENTRYPOINT ["/start"] diff --git a/spigot.conf b/spigot.conf deleted file mode 100644 index 5d55570..0000000 --- a/spigot.conf +++ /dev/null @@ -1,13 +0,0 @@ -[program:copyjar] -command=/usr/local/bin/copyjars.sh -priority=1 -autorestart=false -startretries=0 - - -[program:spigot] -command=java -Xmx%(ENV_MEMLIMIT)s -jar spigot.jar --nojline -user=mcserver -priority=10 -redirect_stderr=true -directory=/srv/spigot/ diff --git a/copyjars.sh b/start similarity index 62% rename from copyjars.sh rename to start index f568235..344864f 100755 --- a/copyjars.sh +++ b/start @@ -1,3 +1,8 @@ -#!/bin/bash +#!/bin/sh + test ! -f /srv/spigot/spigot.jar && mv /srv/spigot-default/spigot.jar /srv/spigot/ test ! -f /srv/spigot/eula.txt && mv /srv/spigot-default/eula.txt /srv/spigot/ + +cd /srv/spigot/ + +exec sudo -Hu mcserver java -Xmx$MEMLIMIT -jar spigot.jar --nojline