updated dockerfile and docker-compose to latest

This commit is contained in:
Marcel Otte 2016-01-09 19:19:15 +01:00
parent 50619b3c42
commit 4199dc672b
2 changed files with 11 additions and 5 deletions

View File

@ -1,10 +1,10 @@
FROM ubuntu:14.04 FROM ubuntu:15.10
MAINTAINER Marcel Otte <qwc+docker@mmo.to> MAINTAINER Marcel Otte <qwc+docker@mmo.to>
RUN apt-get update && apt-get install -y openjdk-7-jre-headless RUN apt-get update && apt-get install -y openjdk-8-jre-headless wget unzip
RUN apt-get install -y wget unzip #RUN apt-get install -y wget unzip
RUN mkdir /terasology RUN mkdir /terasology
RUN wget -P /terasology http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/distributions/Terasology.zip RUN wget -P /terasology http://jenkins.terasology.org/job/DistroOmegaRelease/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip
RUN unzip /terasology/Terasology.zip -d /terasology RUN unzip /terasology/TerasologyOmega.zip -d /terasology
ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server
VOLUME /terasology/server VOLUME /terasology/server
EXPOSE 25777 EXPOSE 25777

6
docker-compose.yml Normal file
View File

@ -0,0 +1,6 @@
terasology:
image: qwick/terasology:latest
ports:
- 25777:25777
volumes:
- /mnt/data/docker/terasology:/terasology/server