From aabced3c5192ee6c0b70c221d701907f36497744 Mon Sep 17 00:00:00 2001 From: Mick Vermeulen Date: Wed, 16 Sep 2020 15:57:57 +0200 Subject: [PATCH] downgrade compose version, add docs on compose version and set proper dll paths relative to Master for StandardScripts and Instance --- README.md | 12 ++++++++---- config.default.xml | 4 ++-- docker-compose.yaml | 6 +----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6a29da3..6a56863 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Docker setup for running the Uchu Lego Universe server ## Requirements - Docker -- Docker Compose +- Docker Compose (a version that supports at least docker-compose v3.3 files) - [LU unpacked client](https://docs.google.com/document/d/1XmHXWuUQqzUIOcv6SVVjaNBm4bFg9lnW4Pk1pllimEg/edit) with [LCDRs TcpUdp mod](https://github.com/lcdr/raknet_shim_dll/releases/tag/2020-09-03) ## Setup @@ -14,19 +14,23 @@ Clone the repository recursively, so that the Uchu source is also pulled: ```bash # If you prefer to use HTTPS (default) -git clone https://github.com/yuwui/Uchu --recursive -b master +git clone https://github.com/MickVermeulen/UchuDocker.git --recursive -b master # If you prefer to use SSH -git clone git@github.com:yuwui/Uchu.git --recursive -b master +git clone git@github.com:MickVermeulen/UchuDocker.git --recursive -b master ``` Copy the `.env.sample` file to `.env`: ```bash +# On Linux, MacOS and Powershell cp .env.sample .env + +# On Windows CMD +copy .env.sample .env ``` -Set the `GAME_FOLDER` variable in the `.env` file to the absolute path to the `/res` folder in your unpacked `LU` game folder. +Set the `GAME_FOLDER` variable in the `.env` file to the absolute path to the `/res` folder in your unpacked `LU` game folder using a text editor of your choice. ## Running diff --git a/config.default.xml b/config.default.xml index dd0fb37..d0459d7 100644 --- a/config.default.xml +++ b/config.default.xml @@ -18,8 +18,8 @@ dotnet - Uchu.Instance/bin/Debug/netcoreapp3.1/Uchu.Instance.dll - Uchu.StandardScripts + ../../../../Uchu.Instance/bin/Debug/netcoreapp3.1/Uchu.Instance.dll + ../../../../Uchu.StandardScripts/bin/Debug/netcoreapp3.1/Uchu.StandardScripts.dll diff --git a/docker-compose.yaml b/docker-compose.yaml index 73874d0..408af70 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,12 +1,10 @@ -version: "3.8" +version: "3.3" services: db: image: postgres:12.2-alpine env_file: - .env restart: always - ports: - - ${DATABASE_PORT}:5432 volumes: - ${DATA_FOLDER}:/var/lib/postgresql/data adminer: @@ -21,8 +19,6 @@ services: env_file: - .env restart: always - ports: - - ${REDIS_PORT}:6379 volumes: - ${DATA_FOLDER}:/data uchu: