remove supervisor

This commit is contained in:
Dave Pedu 2017-02-19 23:38:56 -08:00
parent 15bdc794c1
commit 0a7bb4cafe
3 changed files with 12 additions and 20 deletions

View File

@ -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"]

View File

@ -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/

View File

@ -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