From 4199dc672be26a26001a36490d67fde146d56544 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sat, 9 Jan 2016 19:19:15 +0100 Subject: [PATCH] updated dockerfile and docker-compose to latest --- Dockerfile | 10 +++++----- docker-compose.yml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 948a32e..2326146 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:14.04 +FROM ubuntu:15.10 MAINTAINER Marcel Otte -RUN apt-get update && apt-get install -y openjdk-7-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 unzip /terasology/Terasology.zip -d /terasology +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 EXPOSE 25777 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..894e49b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,6 @@ +terasology: + image: qwick/terasology:latest + ports: + - 25777:25777 + volumes: + - /mnt/data/docker/terasology:/terasology/server