diff --git a/Build.md b/Build.md index d004ed4..0105bd9 100644 --- a/Build.md +++ b/Build.md @@ -16,4 +16,13 @@ The older versions are available as Debian [package](https://packagecloud.io/enn Hence you should bild the image with one of these options: * --build-arg eressea_branch=develop --build-arg echeck_branch=develop -* --build-arg eressea_branch=master --build-arg echeck_branch=develop \ No newline at end of file +* --build-arg eressea_branch=master --build-arg echeck_branch=develop + +## Move to docker hub +To push, call `docker push jacsid/eressea:latest` + +Set new tag and push again: +``` +docker tag jacsid/eressea:latest jacsid/eressea:20201207_dev_dev +docker push jacsid/eressea:20201207_dev_dev +``` \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index fd799f5..5d1cc0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,6 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \ cd git.eressea && \ git submodule update --init && \ patch process/backup-eressea < /eressea/backup-eressea.patch && \ - patch process/create-orders < /eressea/create-orders.patch && \ s/cmake-init && \ s/build && \ ln -sf conf/eressea.ini && \ diff --git a/docker-assets/create-orders.patch b/docker-assets/create-orders.patch deleted file mode 100644 index 8c153e7..0000000 --- a/docker-assets/create-orders.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- create-orders.org 2020-12-03 20:21:23.379383000 +0000 -+++ create-orders 2020-12-03 20:22:20.290087000 +0000 -@@ -10,12 +10,12 @@ - - cd "$ERESSEA/game-$GAME" || exit - --lockfile -r3 -l120 orders.queue.lock - if [ -d "orders.dir.$TURN" ]; then - echo "orders.dir.$TURN already exists" - exit - fi - rm -f "orders.$TURN" -+lockfile -r3 -l120 orders.queue.lock - - cd orders.dir || exit -