remove create-orders patch

This commit is contained in:
2020-12-07 22:46:28 +01:00
parent 4e4f10eff1
commit 889d87dbde
3 changed files with 10 additions and 18 deletions

View File

@ -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: 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=develop --build-arg echeck_branch=develop
* --build-arg eressea_branch=master --build-arg echeck_branch=develop * --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
```

View File

@ -45,7 +45,6 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
cd git.eressea && \ cd git.eressea && \
git submodule update --init && \ git submodule update --init && \
patch process/backup-eressea < /eressea/backup-eressea.patch && \ patch process/backup-eressea < /eressea/backup-eressea.patch && \
patch process/create-orders < /eressea/create-orders.patch && \
s/cmake-init && \ s/cmake-init && \
s/build && \ s/build && \
ln -sf conf/eressea.ini && \ ln -sf conf/eressea.ini && \

View File

@ -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