fix(docker): dockerコンテナでpyxelを実行できるようにする

warau-uichi · warau-uichi · commit ec8fca5f1534 · 2025-05-31T14:09:57.000+09:00
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -41,10 +41,16 @@ RUN uv venv --python python3.11 .venv && \
     uv pip install .[dev]
 ENV PATH="/app/.venv/bin:${PATH}"
 
-# 8. Copy Remaining Project Code (Optional)
+# 8. Copy Xvfb script
+COPY --chown=devuser:devuser docker/run_with_xvfb.sh /usr/local/bin/
+
+# 9. Copy Remaining Project Code (Optional)
 # For development, the rest of the code is typically mounted.
 # If building an image for deployment, you would uncomment the following:
 COPY --chown=devuser:devuser . .
 
+# Set the entrypoint to use Xvfb
+ENTRYPOINT ["/usr/local/bin/run_with_xvfb.sh"]
+
 # Default command (can be overridden in docker-compose.yml or docker run)
 # CMD ["python", "src/main.py"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -14,9 +14,12 @@ services:
     tty: true
     stdin_open: true
     environment:
-      - DISPLAY=${DISPLAY}
+      - DISPLAY=host.docker.internal:0
+      # 以下はXvfbを使用する場合のみ有効
+      # - DISPLAY=:99
       # - QT_X11_NO_MITSHM=1
       # - WAYLAND_DISPLAY=${WAYLAND_DISPLAY}
+    command: bash
 # Named volume for bash history persistence
 volumes:
   dev_bash_history:
diff --git a/docker/run_with_xvfb.sh b/docker/run_with_xvfb.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Start Xvfb in the background
+Xvfb :99 -screen 0 1024x768x24 -ac &
+# Export the display
+export DISPLAY=:99
+# Execute the command passed to this script
+exec "$@"
