[mc] Upgrade base image to java:8

This commit is contained in:
Geoff Bourne
2016-02-20 18:05:41 -06:00
parent 7651cc658e
commit afa25e582d
2 changed files with 3 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
FROM itzg/ubuntu-openjdk-7
FROM java:8
MAINTAINER itzg
@@ -19,7 +19,6 @@ RUN useradd -M -s /bin/false --uid 1000 minecraft \
EXPOSE 25565
COPY start.sh /start
COPY start-minecraft.sh /start-minecraft
VOLUME ["/data"]
@@ -29,7 +28,8 @@ VOLUME ["/plugins"]
COPY server.properties /tmp/server.properties
WORKDIR /data
CMD [ "/start" ]
USER minecraft
CMD [ "/start-minecraft" ]
# Special marker ENV used by MCCY management tool
ENV MC_IMAGE=YES

View File

@@ -1,15 +0,0 @@
#!/bin/sh
set -e
usermod --uid $UID minecraft
groupmod --gid $GID minecraft
chown -R minecraft:minecraft /data /start-minecraft
chmod -R g+wX /data /start-minecraft
while lsof -- /start-minecraft; do
echo -n "."
sleep 1
done
echo "...switching to user 'minecraft'"
exec sudo -E -u minecraft /start-minecraft