Skip to content

Commit eced3c5

Browse files
committed
Works?
1 parent 6ca34ea commit eced3c5

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

docker/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS builder
1+
FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine AS builder
22

33

44
RUN adduser odcompile -H -D
5+
RUN apk add libsodium-dev
56

67
WORKDIR /opendream
78

8-
COPY --chown=odcompile ./OpenDream/ .
9+
COPY ./OpenDream/ .
910

10-
RUN ln -s /opendream/DMCompiler_linux-x64/DMCompiler /usr/bin/
11-
RUN ln -s /opendream/OpenDreamServer_linux-x64/Robust.Server /usr/bin/
11+
RUN ln -s /opendream/DMCompiler_linux-x64/ /opendream/compiler
12+
RUN ln -s /opendream/OpenDreamServer_linux-x64/ /opendream/server
1213

1314
FROM builder
1415

1516
WORKDIR /app
1617

17-
COPY --chown=odcompile docker/run.sh .
18+
COPY docker/run.sh .
1819

19-
RUN chown -R odcompile:odcompile /opendream
20-
21-
RUN chown -R odcompile:odcompile /app
20+
RUN chown -R odcompile: /opendream
21+
RUN chown -R odcompile: /app
2222

2323
USER odcompile
2424

docker/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ cp /app/code/* .
33
echo "---Preamble---"
44
echo Included compiler arguments: "$@"
55
echo "---Start Compiler---"
6-
/usr/bin/DMCompiler "$@" test.dme
6+
dotnet exec /opendream/compiler/DMCompiler.dll "$@" test.dme
77
echo "---End Compiler---"
88
echo "---Start Server---"
9-
/usr/bin/Robust.Server --config-file server_config.toml --cvar opendream.json_path=/app/test.json
9+
dotnet exec /opendream/server/Robust.Server.dll --config-file server_config.toml --cvar opendream.json_path=/app/test.json
1010
echo "---End Server---"

tests/docker_actions/test_docker.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ def test_compile_timeout(build_dir):
4848

4949
chdir(build_dir)
5050
test_output = compileOD(codeText=code, compile_args=[""], build_config="Release", timeout=5)
51-
print(test_output)
5251
assert test_output["timeout"] is True
5352

5453

0 commit comments

Comments
 (0)