-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from kadrim/improve-docker-setup-and-allow-runn…
…ing-on-linux Improve docker setup and allow running on linux
- Loading branch information
Showing
12 changed files
with
143 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ | |
Thumbs.db | ||
ME3Server_WV/bin/Debug/logs/ | ||
/data/ | ||
/compose.override.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
FROM ubuntu:20.04 | ||
|
||
RUN dpkg --add-architecture i386 && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y wine32 winetricks xvfb && apt-get clean | ||
|
||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools && apt-get clean | ||
|
||
RUN useradd -ms /bin/bash appuser | ||
|
||
WORKDIR /syndicate2012-pse | ||
|
||
RUN chown -R appuser:appuser . | ||
|
||
USER appuser | ||
|
||
RUN winetricks -q dotnet452 | ||
|
||
COPY --chown=appuser Docker/Syndicate2012PSE/startup.sh . | ||
|
||
RUN chmod +x startup.sh | ||
|
||
COPY --chown=appuser ./ ./ | ||
|
||
ENV HEADLESS=true | ||
|
||
EXPOSE 14219 42130 | ||
|
||
CMD [ "./startup.sh" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
FROM ubuntu:20.04 | ||
|
||
RUN dpkg --add-architecture i386 && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y wine32 winetricks xvfb && apt-get clean | ||
|
||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools && apt-get clean | ||
|
||
RUN useradd -ms /bin/bash appuser | ||
|
||
WORKDIR /syndicate2012-pse | ||
|
||
RUN chown -R appuser:appuser . | ||
|
||
USER appuser | ||
|
||
RUN winetricks -q dotnet452 | ||
|
||
COPY --chown=appuser Docker/Syndicate2012PSE/startup.sh . | ||
|
||
RUN chmod +x startup.sh | ||
|
||
COPY --chown=appuser ME3Server_WV/bin/Debug/ ./ | ||
|
||
ENV HEADLESS=true | ||
|
||
EXPOSE 14219 42130 | ||
|
||
CMD [ "./startup.sh" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
services: | ||
syndicate2012-pse: | ||
build: | ||
context: ../.. | ||
dockerfile: Docker/Syndicate2012PSE/Dockerfile.debug | ||
environment: | ||
HEADLESS: true | ||
DISPLAY: $DISPLAY | ||
WAYLAND_DISPLAY: $WAYLAND_DISPLAY | ||
XDG_RUNTIME_DIR: $XDG_RUNTIME_DIR | ||
network_mode: host | ||
volumes: | ||
- /tmp/.X11-unix:/tmp/.X11-unix | ||
- '../../ME3Server_WV/bin/Debug/cert:/syndicate2012-pse/cert' | ||
- '../../ME3Server_WV/bin/Debug/conf:/syndicate2012-pse/conf' | ||
- '../../ME3Server_WV/bin/Debug/http:/syndicate2012-pse/http' | ||
- '../../ME3Server_WV/bin/Debug/logs:/syndicate2012-pse/logs' | ||
- '../../ME3Server_WV/bin/Debug/patch:/syndicate2012-pse/patch' | ||
- '../../ME3Server_WV/bin/Debug/player:/syndicate2012-pse/player' | ||
- '../../ME3Server_WV/bin/Debug/replay:/syndicate2012-pse/replay' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/bash | ||
|
||
if [ "$HEADLESS" == "true" ] | ||
then | ||
echo "Running in headless mode" | ||
xvfb-run wine Syndicate2012Server.exe | ||
else | ||
echo "Running in GUI mode" | ||
wine Syndicate2012Server.exe | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
services: | ||
syndicate2012-pse: | ||
build: | ||
context: . | ||
dockerfile: Docker/Syndicate2012PSE/Dockerfile | ||
environment: | ||
HEADLESS: true | ||
DISPLAY: $DISPLAY | ||
WAYLAND_DISPLAY: $WAYLAND_DISPLAY | ||
XDG_RUNTIME_DIR: $XDG_RUNTIME_DIR | ||
network_mode: host | ||
volumes: | ||
- /tmp/.X11-unix:/tmp/.X11-unix | ||
- './cert:/syndicate2012-pse/cert' | ||
- './conf:/syndicate2012-pse/conf' | ||
- './http:/syndicate2012-pse/http' | ||
- './logs:/syndicate2012-pse/logs' | ||
- './patch:/syndicate2012-pse/patch' | ||
- './player:/syndicate2012-pse/player' | ||
- './replay:/syndicate2012-pse/replay' |