Update Dockerfile (#1246)

* Update Dockerfile

update to run on python 3.10

* Add script to build and run Docker container

* Add dockerinfo.md with usage and compatibility info

* Fix wxPython download link in Dockerfile

* Add git installation to Dockerfile

* Update AMULET_VERSION build argument in workflow

* Move docker readme into main readme

* Install Python 3.10 instead of Python 3

update to hardcode version of python to install.

---------

Co-authored-by: gentlegiantJGC <[email protected]>

Author: dragonruler1000

.github/workflows/docker-image.yml

@@ -18,7 +18,7 @@ jobs:
           . \
           --file Dockerfile \
           --tag amulet-editor:latest \
-          --build-arg AMULET_VERSION=CUSTOM:git+https://github.com/Amulet-Team/Amulet-Map-Editor.git@${{ github.event.release.tag_name }}
+          --build-arg AMULET_VERSION=CUSTOM:git+https://github.com/${{ github.repository }}.git@${{ github.event.release.tag_name }}
 
     - name: Save and compress Docker image
       run: |

Dockerfile

@@ -1,19 +1,34 @@
-FROM python:3.9-bullseye
-RUN apt-get update && apt install libgtk-3-dev dbus-x11 wget libnotify4 -y
-RUN pip install --upgrade pip
-RUN wget https://extras.wxpython.org/wxPython4/extras/linux/gtk3/debian-11/wxPython-4.2.0-cp39-cp39-linux_x86_64.whl && pip install wxPython-4.2.0-cp39-cp39-linux_x86_64.whl
+FROM ubuntu:22.04
+
+# Prevent interactive prompts during apt install
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install Python 3.10 (default on Ubuntu 22.04) and required dependencies
+RUN apt-get update && apt-get install -y \
+    python3.10 \
+    python3-pip \
+    git \
+    libgtk-3-dev \
+    dbus-x11 \
+    wget \
+    libnotify4 \
+    libSDL2-2.0 \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install --upgrade pip
+RUN wget https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxpython-4.2.4-cp310-cp310-linux_x86_64.whl && pip3 install wxpython-4.2.4-cp310-cp310-linux_x86_64.whl
+
 ARG AMULET_VERSION=RELEASE  # defaults to the latest version if no arg is given in build command.
 RUN if [ "$(echo "$AMULET_VERSION" | cut -c1-7)" = "CUSTOM:" ]; then \
-        pip install "$(echo "$AMULET_VERSION" | cut -c8-)"; \
+        pip3 install "$(echo "$AMULET_VERSION" | cut -c8-)"; \
     elif [ "$AMULET_VERSION" = "RELEASE" ]; then \
-        pip install --upgrade --upgrade-strategy eager amulet-map-editor; \
+        pip3 install --upgrade --upgrade-strategy eager amulet-map-editor; \
     elif [ "$AMULET_VERSION" = "BETA" ]; then \
-        pip install --upgrade --upgrade-strategy eager amulet-map-editor>=0b0; \
+        pip3 install --upgrade --upgrade-strategy eager amulet-map-editor>=0b0; \
     elif [ "$AMULET_VERSION" = "ALPHA" ]; then \
-        pip install --upgrade --upgrade-strategy eager amulet-map-editor>=0a0; \
+        pip3 install --upgrade --upgrade-strategy eager amulet-map-editor>=0a0; \
     else \
-        pip install --upgrade --upgrade-strategy eager amulet-map-editor==$AMULET_VERSION; \
+        pip3 install --upgrade --upgrade-strategy eager amulet-map-editor==$AMULET_VERSION; \
     fi
-RUN apt-get install libSDL2-2.0 -y
 
-ENTRYPOINT [ "/usr/local/bin/python", "-m", "amulet_map_editor" ]
+ENTRYPOINT [ "/usr/bin/python3", "-m", "amulet_map_editor" ]

README.md

@@ -24,6 +24,11 @@ Extract the contained folder to a location on your computer and run the executab
 3) run `python -m pip install amulet-map-editor` to install the library and all its dependencies.
 4) run `python -m amulet_map_editor` to run the program
 
+## Running with Docker (Linux)
+The Docker image runs on any Linux distro with Docker support.
+To run the Docker image, clone this repository and run `rundocker.sh`.
+Compatibility with wayland is done through xwayland for x11 support.
+
 ### Notes
 
 If you have python 2 installed `python` may point to the wrong version in which case you will have to swap out `python` for `python3`

rundocker.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+docker build -t amulet-editor .
+
+xhost +local:docker
+
+docker run -it --rm \
+  -e DISPLAY=$DISPLAY \
+  -v /tmp/.X11-unix:/tmp/.X11-unix:rw \
+  --device /dev/dri \
+  --network=host \
+  amulet-editor
+
+xhost -local:docker