From a2e73e4e86e821f458131832c79f6c70dc5e9751 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sun, 10 Jan 2016 12:31:04 +0100 Subject: [PATCH 01/18] added dev-latest branch for the DistroOmega cutting edge build. --- Dockerfile | 7 +++---- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cd786b..7b156b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM ubuntu:15.10 MAINTAINER Marcel Otte RUN apt-get update && apt-get install -y openjdk-8-jre wget unzip -#RUN apt-get install -y wget unzip -RUN mkdir /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 +RUN mkdir /terasology \ + && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ + && 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 index 894e49b..efa641f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ terasology: - image: qwick/terasology:latest + image: qwick/terasology:dev-latest ports: - 25777:25777 volumes: -- 2.40.1 From a61cc794869705027bc3ad84309f3920074d0eb5 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sun, 10 Jan 2016 12:46:45 +0100 Subject: [PATCH 02/18] removing zip now, for smaller image size --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b156b9..d2a9f28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ MAINTAINER Marcel Otte RUN apt-get update && apt-get install -y openjdk-8-jre wget unzip RUN mkdir /terasology \ && 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 ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server VOLUME /terasology/server EXPOSE 25777 -- 2.40.1 From 337ff72e9c66da059a3032bf82f704000446d3d2 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Mon, 19 Sep 2016 20:18:20 +0200 Subject: [PATCH 03/18] changed docker tag to dev-latest --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 3a37a5e..06710ef 100755 --- a/build.sh +++ b/build.sh @@ -8,6 +8,8 @@ source versionInfo.properties docker login -u $DOCKER_USER -p $DOCKER_PASSWORD TAGNAME=$engineVersion-$displayVersion +echo The dev-latest build is: $TAGNAME +TAGNAME=dev-latest docker build --no-cache -t qwick/terasology:$TAGNAME . -- 2.40.1 From 2373826792ce707c3349331b36b40c46dc131561 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Mon, 19 Sep 2016 20:21:39 +0200 Subject: [PATCH 04/18] forgot to fix the url for versionInfo.properties... --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 06710ef..e8b1031 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash -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 -- 2.40.1 From 0efb3b50339f4a9244b386de47a830e45607e9ab Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Mon, 19 Sep 2016 20:31:26 +0200 Subject: [PATCH 05/18] now also tagging with dev- --- build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sh b/build.sh index e8b1031..d956a37 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,9 @@ TAGNAME=dev-latest docker build --no-cache -t qwick/terasology:$TAGNAME . +NEW_TAGNAME=dev-$engineVersion + +docker tag qwick/terasology:$TAGNAME qwick/terasology:$NEW_TAGNAME + docker push qwick/terasology:$TAGNAME +docker push qwick/terasology:$NEW_TAGNAME -- 2.40.1 From e475104717bfa71f61d507b14e13c9a5873f40a0 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Wed, 28 Sep 2016 21:20:21 +0200 Subject: [PATCH 06/18] added build number to docker tag. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index d956a37..20d132c 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ TAGNAME=dev-latest docker build --no-cache -t qwick/terasology:$TAGNAME . -NEW_TAGNAME=dev-$engineVersion +NEW_TAGNAME=dev-$engineVersion-$buildNumber docker tag qwick/terasology:$TAGNAME qwick/terasology:$NEW_TAGNAME -- 2.40.1 From 6633401815c9e338c21c629fa21aee7fa3816729 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Mon, 19 Sep 2016 20:46:39 +0200 Subject: [PATCH 07/18] updated Readme to reflect latest changes. --- README.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index fcf0dbc..69fa130 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ # docker-terasology -check out and build with -```docker build .``` +Automatic builds are provided by dockerhub and my own jenkins instance. +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: -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! ;-) +For all developers who want a nightly build for debugging or just testing purposes: +- `docker pull qwick/terasology:dev-latest` (a versioned tag is available too. Example: `dev-1.2.2-SNAPSHOT`) +Versioned tags may change over time. ## Small guide @@ -25,8 +24,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... ;-) -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: * https://github.com/MovingBlocks/Terasology * http://terasology.org/ -- 2.40.1 From 40f727b98de416d0d3c69a5f3c23cd4d2aab7194 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Thu, 6 Oct 2016 10:25:21 +0200 Subject: [PATCH 08/18] changed 'dev' to 'nightly' in tags, to reflect the change in build timing. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 20d132c..9eb4976 100755 --- a/build.sh +++ b/build.sh @@ -9,11 +9,11 @@ source versionInfo.properties TAGNAME=$engineVersion-$displayVersion echo The dev-latest build is: $TAGNAME -TAGNAME=dev-latest +TAGNAME=nightly-latest docker build --no-cache -t qwick/terasology:$TAGNAME . -NEW_TAGNAME=dev-$engineVersion-$buildNumber +NEW_TAGNAME=nightly-$engineVersion-$buildNumber docker tag qwick/terasology:$TAGNAME qwick/terasology:$NEW_TAGNAME -- 2.40.1 From 57432e3e5c7df236695b84a8bb6893fa65e3fbdb Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Thu, 6 Oct 2016 10:32:26 +0200 Subject: [PATCH 09/18] Readme update for changed dev->nightly tag names --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 69fa130..653d4bd 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,22 @@ For all enthusiasts who just want to have a running server: - or with version: `docker pull qwick/terasology:1.2.1-alpha` For all developers who want a nightly build for debugging or just testing purposes: -- `docker pull qwick/terasology:dev-latest` (a versioned tag is available too. Example: `dev-1.2.2-SNAPSHOT`) +- `docker pull qwick/terasology:nightly-latest` +- a versioned tag is available too. Versioned tags may change over time. +## Versioning + +To avoid confusion here the docker image tag schema: + +Stable: +- `-` e.g. `1.2.1-alpha` + +Nightly: +- `nightly--` e.g. `nightly-1.2.2-SNAPSHOT-1806` + + ## 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. -- 2.40.1 From b0056f2518cb86fe21d752d21fbf9e1ed216454c Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sat, 8 Oct 2016 11:33:13 +0200 Subject: [PATCH 10/18] again changed nightly to unstable, because of jenkins job changes --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 9eb4976..630d07f 100755 --- a/build.sh +++ b/build.sh @@ -9,11 +9,11 @@ source versionInfo.properties TAGNAME=$engineVersion-$displayVersion echo The dev-latest build is: $TAGNAME -TAGNAME=nightly-latest +TAGNAME=unstable-latest docker build --no-cache -t qwick/terasology:$TAGNAME . -NEW_TAGNAME=nightly-$engineVersion-$buildNumber +NEW_TAGNAME=unstable-$engineVersion-$buildNumber docker tag qwick/terasology:$TAGNAME qwick/terasology:$NEW_TAGNAME -- 2.40.1 From 29729afca1144b8d229dd2d933c38911d7ec1114 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sat, 8 Oct 2016 11:44:58 +0200 Subject: [PATCH 11/18] readme changes to reflect new versioning schema, again. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 653d4bd..46d507c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ For all enthusiasts who just want to have a running server: - or with version: `docker pull qwick/terasology:1.2.1-alpha` For all developers who want a nightly build for debugging or just testing purposes: -- `docker pull qwick/terasology:nightly-latest` +- `docker pull qwick/terasology:unstable-latest` - a versioned tag is available too. Versioned tags may change over time. @@ -18,8 +18,8 @@ To avoid confusion here the docker image tag schema: Stable: - `-` e.g. `1.2.1-alpha` -Nightly: -- `nightly--` e.g. `nightly-1.2.2-SNAPSHOT-1806` +Unstable: +- `unstable--` e.g. `unstable-1.2.2-SNAPSHOT-1806` ## Small guide -- 2.40.1 From abdfd029869b9de404249e9f58aa733059617fdd Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sat, 8 Oct 2016 11:45:49 +0200 Subject: [PATCH 12/18] oops --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46d507c..e939760 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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` -For all developers who want a nightly build for debugging or just testing purposes: +For all developers who want a unstable build for debugging or just testing purposes: - `docker pull qwick/terasology:unstable-latest` - a versioned tag is available too. -- 2.40.1 From 9473363d74821b0ae0e9211df3011c1760b5cac5 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sun, 23 Oct 2016 10:10:15 +0200 Subject: [PATCH 13/18] added a unused property with -D to commandline the added property -Dterasology_variant=unstable will be used to distinguish between a stable and unstable instance on the same server maybe there could be a added an additional property for version information or similar. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c967a72..82a7faf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ RUN mkdir /terasology \ && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ && unzip /terasology/TerasologyOmega.zip -d /terasology \ && rm -f /terasology/TerasologyOmega.zip -ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server +ENTRYPOINT java -Dterasology_variant=unstable -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server VOLUME /terasology/server EXPOSE 25777 -- 2.40.1 From 5e1311dc338bd709adc62d92aa975866fa60141c Mon Sep 17 00:00:00 2001 From: "Marcel M. Otte" Date: Tue, 16 Jan 2018 15:19:12 +0100 Subject: [PATCH 14/18] Added Jenkinsfile. Does just call build.sh. --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..0d32185 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,7 @@ +node ('main') { + stage('docker') { + sh ''' + sh build.sh + ''' + } +} -- 2.40.1 From 726eeb7f2dfb39fbc10beb7f11c76dd258c8b181 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Tue, 3 Apr 2018 21:08:16 +0200 Subject: [PATCH 15/18] Removing any existing versionInfo.properties now. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 630d07f..1da0022 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ #!/bin/bash +rm versionInfo.properties* wget http://jenkins.terasology.org/job/Terasology/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties -- 2.40.1 From d085e15c66d5856602b9a6e5f3c7987915ab7324 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 4 Jul 2018 20:32:05 +0200 Subject: [PATCH 16/18] Fix for PathManager issue --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82a7faf..d2c5c95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ RUN mkdir /terasology \ && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ && unzip /terasology/TerasologyOmega.zip -d /terasology \ && rm -f /terasology/TerasologyOmega.zip -ENTRYPOINT java -Dterasology_variant=unstable -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 VOLUME /terasology/server EXPOSE 25777 -- 2.40.1 From 355fcc2b995f7e8da23dd393c561736d52369315 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sun, 10 Mar 2019 13:27:21 +0100 Subject: [PATCH 17/18] Update to ubuntu:18.04 and jdk11 --- Dockerfile | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2c5c95..b996c8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Marcel Otte -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 \ && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ && unzip /terasology/TerasologyOmega.zip -d /terasology \ diff --git a/docker-compose.yml b/docker-compose.yml index efa641f..4d8ccf9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,4 +3,4 @@ terasology: ports: - 25777:25777 volumes: - - /mnt/data/docker/terasology:/terasology/server + - ./terasology:/terasology/server -- 2.40.1 From 8536a2ff73272b872741fadbef63ce142801049c Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Sat, 9 Jan 2021 18:24:38 +0100 Subject: [PATCH 18/18] Add installPath --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b996c8d..eaf407c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ RUN mkdir /terasology \ && wget -P /terasology http://jenkins.terasology.org/job/DistroOmega/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \ && unzip /terasology/TerasologyOmega.zip -d /terasology \ && rm -f /terasology/TerasologyOmega.zip -ENTRYPOINT cd /terasology && java -Dterasology_variant=unstable -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 EXPOSE 25777 -- 2.40.1