Move current orders in turn-folder
This commit is contained in:
@ -36,6 +36,7 @@ RUN mkdir -p /eressea/server && \
|
|||||||
FROM eressea-base as eressea
|
FROM eressea-base as eressea
|
||||||
ARG eressea_branch
|
ARG eressea_branch
|
||||||
COPY docker-assets/backup-eressea.patch /eressea/
|
COPY docker-assets/backup-eressea.patch /eressea/
|
||||||
|
COPY docker-assets/create-orders.patch /eressea/
|
||||||
COPY docker-assets/run-eressea.cron.patch /eressea/
|
COPY docker-assets/run-eressea.cron.patch /eressea/
|
||||||
RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
|
RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
|
||||||
cmake luarocks libxml2-dev liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev \
|
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 && \
|
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 && \
|
||||||
patch process/cron/run-eressea.cron < /eressea/run-eressea.cron.patch && \
|
patch process/cron/run-eressea.cron < /eressea/run-eressea.cron.patch && \
|
||||||
s/cmake-init && \
|
s/cmake-init && \
|
||||||
s/build && \
|
s/build && \
|
||||||
|
14
docker-assets/create-orders.patch
Normal file
14
docker-assets/create-orders.patch
Normal file
@ -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"
|
||||||
|
|
Reference in New Issue
Block a user