dev #1

Closed
qwc wants to merge 20 commits from dev into master
5 changed files with 40 additions and 16 deletions

View File

@ -1,10 +1,10 @@
FROM ubuntu:16.04 FROM ubuntu:18.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-11-jre wget unzip
RUN mkdir /terasology \ RUN mkdir /terasology \
&& wget -P /terasology http://jenkins.terasology.org/job/DistroOmegaRelease/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \
&& unzip /terasology/TerasologyOmega.zip -d /terasology \ && unzip /terasology/TerasologyOmega.zip -d /terasology \
&& rm -f /terasology/TerasologyOmega.zip && rm -f /terasology/TerasologyOmega.zip
ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server ENTRYPOINT cd /terasology && java -Dterasology_variant=unstable -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server -installPath=/terasology
VOLUME /terasology/server VOLUME /terasology/server
EXPOSE 25777 EXPOSE 25777

7
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,7 @@
node ('main') {
stage('docker') {
sh '''
sh build.sh
'''
}
}

View File

@ -1,14 +1,25 @@
# docker-terasology # docker-terasology
check out and build with Automatic builds are provided by dockerhub and my own jenkins instance.
```docker build .``` For all enthusiasts who just want to have a running server:
- `docker pull qwick/terasology:latest`
- or with version: `docker pull qwick/terasology:1.2.1-alpha`
or use the image on dockerhub: For all developers who want a unstable build for debugging or just testing purposes:
https://registry.hub.docker.com/u/qwick/terasology/ - `docker pull qwick/terasology:unstable-latest`
- a versioned tag is available too.
## Latest changes Versioned tags may change over time.
### 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! ;-) ## Versioning
To avoid confusion here the docker image tag schema:
Stable:
- `<engineVersion>-<displayVersion>` e.g. `1.2.1-alpha`
Unstable:
- `unstable-<engineVersion>-<buildNumber>` e.g. `unstable-1.2.2-SNAPSHOT-1806`
## Small guide ## Small guide
@ -25,8 +36,6 @@ Best practice would be cloning this repository and using docker-compose to pull
There may be standard configurations in the future for specific use cases, may be... ;-) There may be standard configurations in the future for specific use cases, may be... ;-)
One thing's for sure, I'll keep this a little more updated after this long time of silence.
More information about terasology can be found on following sites: More information about terasology can be found on following sites:
* https://github.com/MovingBlocks/Terasology * https://github.com/MovingBlocks/Terasology
* http://terasology.org/ * http://terasology.org/

View File

@ -1,14 +1,22 @@
#!/bin/bash #!/bin/bash
rm versionInfo.properties*
wget http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties wget http://jenkins.terasology.org/job/Terasology/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties
source versionInfo.properties source versionInfo.properties
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
TAGNAME=$engineVersion-$displayVersion TAGNAME=$engineVersion-$displayVersion
echo The dev-latest build is: $TAGNAME
TAGNAME=unstable-latest
docker build --no-cache -t qwick/terasology:$TAGNAME . docker build --no-cache -t qwick/terasology:$TAGNAME .
NEW_TAGNAME=unstable-$engineVersion-$buildNumber
docker tag qwick/terasology:$TAGNAME qwick/terasology:$NEW_TAGNAME
docker push qwick/terasology:$TAGNAME docker push qwick/terasology:$TAGNAME
docker push qwick/terasology:$NEW_TAGNAME

View File

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