Merge branch 'master' of temporary server repository
This commit is contained in:
commit
2aeb2c1ef3
|
@ -1,10 +1,9 @@
|
|||
FROM ubuntu:14.10
|
||||
FROM ubuntu:15.10
|
||||
MAINTAINER Marcel Otte <qwc+docker@mmo.to>
|
||||
RUN apt-get update && apt-get install -y openjdk-8-jre-headless
|
||||
RUN apt-get install -y wget unzip
|
||||
RUN apt-get update && apt-get install -y openjdk-8-jre-headless wget unzip
|
||||
#RUN apt-get install -y wget unzip
|
||||
RUN mkdir /terasology
|
||||
#RUN wget -P /terasology http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/distributions/Terasology.zip
|
||||
RUN wget --quiet -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip
|
||||
RUN wget -P /terasology http://jenkins.terasology.org/job/DistroOmegaRelease/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip
|
||||
RUN unzip /terasology/TerasologyOmega.zip -d /terasology
|
||||
ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server
|
||||
VOLUME /terasology/server
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
terasology:
|
||||
image: qwick/terasology:latest
|
||||
ports:
|
||||
- 25777:25777
|
||||
volumes:
|
||||
- /mnt/data/docker/terasology:/terasology/server
|
Loading…
Reference in New Issue