diff --git a/Dockerfile b/Dockerfile index b3eb80b..35bcff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,11 @@ RUN mkdir -p /var/vintagestory RUN chown -R vintagestory:vintagestory /var/vintagestory -RUN mkdir -p /home/vintagestory/server /home/vintagestory/install +RUN mkdir -p /home/vintagestory/server -COPY ./startup.sh /home/vintagestory/. +COPY ./startup.sh /home/vintagestory/server/. -RUN chmod +x /home/vintagestory/startup.sh +RUN chmod +x /home/vintagestory/server/startup.sh RUN chown -R vintagestory /home/vintagestory @@ -34,9 +34,7 @@ RUN ./dotnet-install.sh --channel 7.0 --runtime dotnet RUN rm dotnet-install.sh -RUN chmod -R 700 /home/vintagestory/server /home/vintagestory/install - -WORKDIR /home/vintagestory/install +WORKDIR /home/vintagestory/server RUN wget "https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_${VERSION}.tar.gz" @@ -46,8 +44,6 @@ RUN rm "vs_server_linux-x64_${VERSION}.tar.gz" RUN chmod +x server.sh -WORKDIR /home/vintagestory/ - ENV HOME=/home/vintagestory ENV DOTNET_ROOT=$HOME/.dotnet diff --git a/docker-compose.yml b/docker-compose.yml index 9f63036..a0faadb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: vintageserver: container_name: vintageserver - image: 'git.protron.dev/doc/vintagecontainer:1.2' + image: 'git.protron.dev/doc/vintagecontainer:1.3' user: "${UID}:${GID}" ports: - '42420:42420' diff --git a/startup.sh b/startup.sh index 3be7b40..b32d605 100644 --- a/startup.sh +++ b/startup.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -mv /home/vintagestory/install/* /home/vintagestory/server/. - -./server/server.sh start +./server.sh start tail -f /var/vintagestory/data/Logs/server-main.txt \ No newline at end of file