Merge remote-tracking branch 'refs/remotes/origin/mc-issue-47'

This commit is contained in:
Geoff Bourne 2015-12-01 21:47:02 -06:00
commit 0acedd04b9
2 changed files with 6 additions and 2 deletions

View File

@ -5,7 +5,7 @@ MAINTAINER itzg
ENV APT_GET_UPDATE 2015-10-03 ENV APT_GET_UPDATE 2015-10-03
RUN apt-get update RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libmozjs-24-bin imagemagick && apt-get clean RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libmozjs-24-bin imagemagick lsof && apt-get clean
RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100 RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100
RUN wget -O /usr/bin/jsawk https://github.com/micha/jsawk/raw/master/jsawk RUN wget -O /usr/bin/jsawk https://github.com/micha/jsawk/raw/master/jsawk

View File

@ -4,5 +4,9 @@ set -e
usermod --uid $UID minecraft usermod --uid $UID minecraft
chown -R minecraft /data /start-minecraft chown -R minecraft /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 exec sudo -E -u minecraft /start-minecraft