Skip to content

Commit

Permalink
use release versions
Browse files Browse the repository at this point in the history
  • Loading branch information
MickVermeulen committed Oct 27, 2020
1 parent b6e6da5 commit e803645
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 45 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -16,15 +16,14 @@ Docker setup for running the Uchu Lego Universe server
Clone the repository recursively, so that the Uchu source is also pulled:

```bash
git clone [email protected]:MickVermeulen/UchuDocker.git --recursive -b master
git clone [email protected]:UchuServer/UchuDocker.git --recursive -b master
```

#### Setting up your environment

Copy the `.env.sample` file to `.env`:

```bash
# Use Bash or Powershell
cp .env.sample .env
```

Expand Down Expand Up @@ -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 <username>`. 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 <username>`. You can exit the shell using `Ctrl+P + Ctrl+Q` (Don't use `Ctrl+C`: it closes the container, not just your session).

## Closing

Expand Down
2 changes: 1 addition & 1 deletion Uchu
Submodule Uchu updated from 59c944 to a23b5b
4 changes: 2 additions & 2 deletions Uchu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/netcoreapp3.1/Uchu.Master.dll"]
4 changes: 2 additions & 2 deletions config.default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</FileLogging>
<DllSource>
<DotNetPath>dotnet</DotNetPath>
<Instance>../../../../Uchu.Instance/bin/Debug/netcoreapp3.1/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Debug/netcoreapp3.1/Uchu.StandardScripts.dll</ScriptDllSource>
<Instance>../../../../Uchu.Instance/bin/Release/netcoreapp3.1/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/netcoreapp3.1/Uchu.StandardScripts.dll</ScriptDllSource>
</DllSource>
<ManagedScriptSources />
<ResourcesConfiguration>
Expand Down
36 changes: 0 additions & 36 deletions uchu.sh

This file was deleted.

0 comments on commit e803645

Please sign in to comment.