Merge branch 'master' into dev
This commit is contained in:
commit
f839fa8ad2
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:15.10
|
FROM ubuntu:16.04
|
||||||
MAINTAINER Marcel Otte <qwc+docker@mmo.to>
|
MAINTAINER Marcel Otte <qwc+docker@mmo.to>
|
||||||
RUN apt-get update && apt-get install -y openjdk-8-jre wget unzip
|
RUN apt-get update && apt-get install -y openjdk-8-jre wget unzip
|
||||||
RUN mkdir /terasology \
|
RUN mkdir /terasology \
|
||||||
|
|
|
@ -6,6 +6,11 @@ check out and build with
|
||||||
or use the image on dockerhub:
|
or use the image on dockerhub:
|
||||||
https://registry.hub.docker.com/u/qwick/terasology/
|
https://registry.hub.docker.com/u/qwick/terasology/
|
||||||
|
|
||||||
|
## Latest changes
|
||||||
|
### 2016-03-16: [Alpha release 1; Engine v1.0.0](https://github.com/MovingBlocks/Terasology/releases/tag/v1.0.0)
|
||||||
|
I'm again a little late with the docker image update, sorry! ;-)
|
||||||
|
|
||||||
|
|
||||||
## Small guide
|
## Small guide
|
||||||
|
|
||||||
Be aware that this image provides a bare terasology server, if you want to enable specific modules, you have to do this yourself.
|
Be aware that this image provides a bare terasology server, if you want to enable specific modules, you have to do this yourself.
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
wget http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties
|
||||||
|
|
||||||
|
source versionInfo.properties
|
||||||
|
|
||||||
|
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
|
||||||
|
|
||||||
|
TAGNAME=$engineVersion-$displayVersion
|
||||||
|
|
||||||
|
docker build --no-cache -t qwick/terasology:$TAGNAME .
|
||||||
|
|
||||||
|
docker push qwick/terasology:$TAGNAME
|
Loading…
Reference in New Issue