diff --git a/README.md b/README.md index 925eb25..9c79dc1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Docker setup for running the Uchu Lego Universe server - Docker - 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) -- Bash or PowerShell +- Bash (macOS / Linux) or PowerShell (Windows) ## Setup @@ -16,7 +16,7 @@ Docker setup for running the Uchu Lego Universe server Clone the repository recursively, so that the Uchu source is also pulled: ```bash -git clone git@github.com:MickVermeulen/UchuDocker.git --recursive -b master +git clone git@github.com:UchuServer/UchuDocker.git --recursive -b master ``` #### Setting up your environment @@ -24,7 +24,6 @@ git clone git@github.com:MickVermeulen/UchuDocker.git --recursive -b master Copy the `.env.sample` file to `.env`: ```bash -# Use Bash or Powershell cp .env.sample .env ``` @@ -52,7 +51,7 @@ This runs Uchu in the background along with Postgres and Redis. You can attach t docker attach uchudocker_uchu_1 ``` -This allows you to input shell commands like `/adduser `. You can exit the shell using `Ctrl+P + Ctrl+Q` (`Ctrl+C` closes the container, not just your session). +This allows you to input shell commands like `/adduser `. You can exit the shell using `Ctrl+P + Ctrl+Q` (Don't use `Ctrl+C`: it closes the container, not just your session). ## Closing diff --git a/Uchu b/Uchu index 59c9449..a23b5b1 160000 --- a/Uchu +++ b/Uchu @@ -1 +1 @@ -Subproject commit 59c944930c19063faa9f028a8c8fec9c48e261bd +Subproject commit a23b5b1bcb779fbb4ebe92b81b225b6ab76ef509 diff --git a/Uchu.Dockerfile b/Uchu.Dockerfile index 760f46f..c4bfc67 100644 --- a/Uchu.Dockerfile +++ b/Uchu.Dockerfile @@ -4,6 +4,6 @@ COPY Uchu config.default.xml .env cert.pfx* ./ RUN apk update && apk add --no-cache gettext && apk add --no-cache curl RUN set -o allexport && source .env && set +o allexport && envsubst < config.default.xml > config.xml -RUN dotnet build +RUN dotnet build --configuration Release -ENTRYPOINT ["dotnet", "Uchu.Master/bin/Debug/netcoreapp3.1/Uchu.Master.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/netcoreapp3.1/Uchu.Master.dll"] \ No newline at end of file diff --git a/config.default.xml b/config.default.xml index 6b42b68..90839ba 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/bin/Debug/netcoreapp3.1/Uchu.StandardScripts.dll + ../../../../Uchu.Instance/bin/Release/netcoreapp3.1/Uchu.Instance.dll + ../../../../Uchu.StandardScripts/bin/Release/netcoreapp3.1/Uchu.StandardScripts.dll diff --git a/uchu.sh b/uchu.sh deleted file mode 100644 index b3eb27a..0000000 --- a/uchu.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# WIP Install script - -if ! [ -f ".env" ]; then - echo "Environment file does not exist yet, setting it up for you." - echo "Please specify a valid absolute path to the /res folder inside your LU client (make sure to escape spaces):" - - while ! [ -d "$GAME_FOLDER" ]; do - read GAME_FOLDER - if ! [ -d "$GAME_FOLDER" ]; then - echo "$GAME_FOLDER is not a valid directory, retry:" - fi - done - - if ! [ -d "$GAME_FOLDER/../mods" ]; then - echo "It seems like you don't have the TcpUdp mod installed in your client, you won't be able to connect with Uchu until you install this mod. More information can be found in the README." - else - echo "$GAME_FOLDER seems like a valid location, continuing." - fi - - sed "s|/res|$GAME_FOLDER|g" .env.sample > .env - - echo "Finished setting up environment file." -fi - -if ! [ -d "data" ]; then - echo "Database folder not found, adding \"data\" folder." - mkdir data -fi - -if [ -x "$(command -v docker)" ] && [ -x "$(command -v docker-compose)" ]; then - echo "Starting Uchu" - docker-compose up --build -else - echo "You don't have docker or docker-compose installed, refer to the README for installation instructions." -fi \ No newline at end of file