Jelajahi Sumber

launch script -> docker compose

Fabian Peter Hammerle 4 tahun lalu
induk
melakukan
d1dbb9e97f
3 mengubah file dengan 22 tambahan dan 14 penghapusan
  1. 2 0
      Dockerfile
  2. 20 0
      docker-compose.yml
  3. 0 14
      launch

+ 2 - 0
Dockerfile

@@ -24,4 +24,6 @@ RUN mkdir /toontown-rewritten/engine \
 USER player
 VOLUME /toontown-rewritten/engine
 WORKDIR /toontown-rewritten/engine
+# TODO required?
+ENV QT_X11_NO_MITSHM=1
 CMD /toontown-rewritten/launcher/Launcher

+ 20 - 0
docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+
+volumes:
+  engine:
+
+# TODO consider passing $XAUTHORITY
+# https://stackoverflow.com/a/25280523/5894777
+
+services:
+  toontown_rewritten:
+    build: .
+    environment:
+    - DISPLAY
+    volumes:
+    # TODO mount readonly?
+    - /tmp/.X11-unix:/tmp/.X11-unix:rw
+    - engine:/toontown-rewritten/engine:rw
+    security_opt: [no-new-privileges]
+
+# https://docs.docker.com/compose/compose-file

+ 0 - 14
launch

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-cd "$(dirname "$0")"
-
-set -ex
-
-docker build -t ttr .
-
-docker run -ti \
-    --env DISPLAY=$DISPLAY \
-    -v /tmp/.X11-unix:/tmp/.X11-unix:ro \
-    -v toontown_rewritten_engine:/toontown-rewritten/engine:rw \
-    --env QT_X11_NO_MITSHM=1 \
-    ttr