From c54ebea0eb34bde39c60c44611f1fbc495a8dafe Mon Sep 17 00:00:00 2001
From: Doc <Doctor_Luigi@aol.com>
Date: Wed, 7 Aug 2024 12:18:31 +0200
Subject: [PATCH] server directory can now be binded

---
 Dockerfile         | 14 ++++++++------
 docker-compose.yml | 10 ++++++++++
 startup.sh         |  4 +++-
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 037d7dc..f077d00 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,11 +10,11 @@ RUN mkdir -p /var/vintagestory
 
 RUN chown -R vintagestory:vintagestory /var/vintagestory
 
-RUN mkdir -p /home/vintagestory/server
+RUN mkdir -p /home/vintagestory/server /home/vintagestory/install
 
-COPY ./startup.sh /home/vintagestory/server/.
+COPY ./startup.sh /home/vintagestory/.
 
-RUN chmod +x /home/vintagestory/server/startup.sh
+RUN chmod +x /home/vintagestory/startup.sh
 
 RUN chown -R vintagestory /home/vintagestory
 
@@ -30,9 +30,9 @@ RUN chmod +x ./dotnet-install.sh
 
 RUN ./dotnet-install.sh --channel 7.0 --runtime dotnet
 
-RUN chmod -R 700 ./server
+RUN chmod -R 700 /home/vintagestory/server /home/vintagestory/install
 
-WORKDIR /home/vintagestory/server
+WORKDIR /home/vintagestory/install
 
 RUN wget https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_1.18.8.tar.gz
 
@@ -40,6 +40,8 @@ RUN tar xzf vs_server_linux-x64_1.18.8.tar.gz
 
 RUN chmod +x server.sh 
 
+WORKDIR /home/vintagestory/
+
 ENV HOME=/home/vintagestory
 
 ENV DOTNET_ROOT=$HOME/.dotnet
@@ -48,4 +50,4 @@ ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
 
 EXPOSE 42420
 
-CMD [ "./startup.sh" ]
+ENTRYPOINT [ "./startup.sh" ]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..8776897
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+services:
+    vintageserver:
+      container_name: vintageserver
+      image: 'git.protron.dev/doc/vintagecontainer:1.0'
+      user: "${UID}:${GID}"
+      ports:
+        - '42420:42420'
+      volumes:
+        - ./server:/home/vintagestory/server
+        - ./data:/var/vintagestory/data
\ No newline at end of file
diff --git a/startup.sh b/startup.sh
index b32d605..3be7b40 100644
--- a/startup.sh
+++ b/startup.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
-./server.sh start
+mv /home/vintagestory/install/* /home/vintagestory/server/.
+
+./server/server.sh start
 
 tail -f /var/vintagestory/data/Logs/server-main.txt
\ No newline at end of file