From 01235b465ef8f046afdfed814cdc733c0e3afe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Holly?= Date: Sat, 26 Dec 2020 10:37:26 +0100 Subject: [PATCH] Move current orders in turn-folder --- Dockerfile | 2 ++ docker-assets/create-orders.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 docker-assets/create-orders.patch diff --git a/Dockerfile b/Dockerfile index f118e3b..5711bd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN mkdir -p /eressea/server && \ FROM eressea-base as eressea ARG eressea_branch COPY docker-assets/backup-eressea.patch /eressea/ +COPY docker-assets/create-orders.patch /eressea/ COPY docker-assets/run-eressea.cron.patch /eressea/ RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \ cmake luarocks libxml2-dev liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev \ @@ -45,6 +46,7 @@ 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 && \ patch process/cron/run-eressea.cron < /eressea/run-eressea.cron.patch && \ s/cmake-init && \ s/build && \ diff --git a/docker-assets/create-orders.patch b/docker-assets/create-orders.patch new file mode 100644 index 0000000..aa25604 --- /dev/null +++ b/docker-assets/create-orders.patch @@ -0,0 +1,14 @@ +--- create-orders 2020-12-26 10:04:52.000000000 +0100 ++++ create-orders copy 2020-12-26 10:06:56.000000000 +0100 +@@ -14,9 +14,10 @@ + echo "orders.dir.$TURN already exists" + exit + fi ++mv orders.dir orders.dir.$TURN + rm -f "orders.$TURN" + +-cd orders.dir || exit ++cd orders.dir.$TURN || exit + + php ../../orders-php/cli.php -d "orders.db" export | tr -d '\r' > "../orders.$TURN" +