Fixup 'NDS' vs 'NDS_ARM9' platform id for Docker (#880)

* Fixup 'NDS' vs 'NDS_ARM9' platform id for Docker

* Add missing platform environment vars to Docker

* Update wibo

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
           sudo mv bin/arm* /usr/bin/
       - name: Install wibo
         run: |-
-          wget https://github.com/decompals/WiBo/releases/download/0.5.2/wibo && chmod +x wibo && sudo cp wibo /usr/bin/
+          wget https://github.com/decompals/WiBo/releases/download/0.6.4/wibo && chmod +x wibo && sudo cp wibo /usr/bin/
 
       - name: Run backend tests
         run: |-

backend/Dockerfile

@@ -60,25 +60,29 @@ RUN curl -sSL https://install.python-poetry.org/ | \
 
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
-COPY --from=ghcr.io/decompals/wibo:0.5.2 /usr/local/sbin/wibo /usr/bin/
+COPY --from=ghcr.io/decompals/wibo:0.6.4 /usr/local/sbin/wibo /usr/bin/
 
 # windows compilers need i386 wine
-ARG ENABLE_NDS_SUPPORT
-ARG ENABLE_PS1_SUPPORT
 ARG ENABLE_GC_WII_SUPPORT
-ARG ENABLE_SATURN_SUPPORT
 ARG ENABLE_MSDOS_SUPPORT
+ARG ENABLE_NDS_ARM9_SUPPORT
+ARG ENABLE_N3DS_SUPPORT
+ARG ENABLE_PS1_SUPPORT
+ARG ENABLE_PS2_SUPPORT
 ARG ENABLE_WIN9X_SUPPORT
-RUN if [ "${ENABLE_NDS_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
+RUN if [ "${ENABLE_GC_WII_SUPPORT}" = "YES" ] || \
        [ "${ENABLE_MSDOS_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_WIN9X_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_GC_WII_SUPPORT}" = "YES" ]; then \
+       [ "${ENABLE_N3DS_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_NDS_ARM9_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_PS2_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_WIN9X_SUPPORT}" = "YES" ]; then \
     dpkg --add-architecture i386 && apt-get update && \
     apt-get install -y -o APT::Immediate-Configure=false \
         wine; \
     fi
 
+ARG ENABLE_SATURN_SUPPORT
 # install dos2unix and dosemu2 for ps1 and saturn
 RUN if [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
        [ "${ENABLE_SATURN_SUPPORT}" = "YES" ]; then \
@@ -103,20 +107,6 @@ RUN if [ "${ENABLE_MSDOS_SUPPORT}" = "YES" ]; then \
     rm omftools.tar.gz; \
     fi
 
-ARG ENABLE_GBA_SUPPORT
-ARG ENABLE_N64_SUPPORT
-ARG ENABLE_SWITCH_SUPPORT
-
-ENV ENABLE_GBA_SUPPORT=${ENABLE_GBA_SUPPORT}
-ENV ENABLE_GC_WII_SUPPORT=${ENABLE_GC_WII_SUPPORT}
-ENV ENABLE_N64_SUPPORT=${ENABLE_N64_SUPPORT}
-ENV ENABLE_NDS_SUPPORT=${ENABLE_NDS_SUPPORT}
-ENV ENABLE_PS1_SUPPORT=${ENABLE_PS1_SUPPORT}
-ENV ENABLE_SWITCH_SUPPORT=${ENABLE_SWITCH_SUPPORT}
-ENV ENABLE_SATURN_SUPPORT=${ENABLE_SATURN_SUPPORT}
-ENV ENABLE_MSDOS_SUPPORT=${ENABLE_MSDOS_SUPPORT}
-ENV ENABLE_WIN9X_SUPPORT=${ENABLE_WIN9X_SUPPORT}
-
 RUN mkdir -p /etc/fonts
 
 WORKDIR /backend
@@ -134,14 +124,35 @@ RUN useradd --create-home user \
 USER user
 
 # initialize wine files to /home/user/.wine
-RUN if [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_GC_WII_SUPPORT}" = "YES" ] || \
+RUN if [ "${ENABLE_GC_WII_SUPPORT}" = "YES" ] || \
        [ "${ENABLE_MSDOS_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_WIN9X_SUPPORT}" = "YES" ] || \
-       [ "${ENABLE_NDS_SUPPORT}" = "YES" ]; then \
+       [ "${ENABLE_N3DS_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_NDS_ARM9_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_PS2_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_WIN9X_SUPPORT}" = "YES" ]; then \
     wineboot --init; \
     fi
 
 ENV PATH="$PATH:/etc/poetry/bin"
 
+# no special dependencies required for these platforms
+ARG ENABLE_GBA_SUPPORT
+ARG ENABLE_MACOSX_SUPPORT
+ARG ENABLE_N64_SUPPORT
+ARG ENABLE_SWITCH_SUPPORT
+
+ENV ENABLE_GBA_SUPPORT=${ENABLE_GBA_SUPPORT}
+ENV ENABLE_GC_WII_SUPPORT=${ENABLE_GC_WII_SUPPORT}
+ENV ENABLE_MACOSX_SUPPORT=${ENABLE_MACOSX_SUPPORT}
+ENV ENABLE_MSDOS_SUPPORT=${ENABLE_MSDOS_SUPPORT}
+ENV ENABLE_N3DS_SUPPORT=${ENABLE_N3DS_SUPPORT}
+ENV ENABLE_N64_SUPPORT=${ENABLE_N64_SUPPORT}
+ENV ENABLE_NDS_ARM9_SUPPORT=${ENABLE_NDS_ARM9_SUPPORT}
+ENV ENABLE_PS1_SUPPORT=${ENABLE_PS1_SUPPORT}
+ENV ENABLE_PS2_SUPPORT=${ENABLE_PS2_SUPPORT}
+ENV ENABLE_SATURN_SUPPORT=${ENABLE_SATURN_SUPPORT}
+ENV ENABLE_SWITCH_SUPPORT=${ENABLE_SWITCH_SUPPORT}
+ENV ENABLE_WIN9X_SUPPORT=${ENABLE_WIN9X_SUPPORT}
+
 ENTRYPOINT ["/backend/docker_entrypoint.sh"]

docker-compose.yaml

@@ -16,22 +16,25 @@ services:
         ENABLE_GBA_SUPPORT: "YES"
         ENABLE_N64_SUPPORT: "YES"
         # dont install wine32 etc by default
-        ENABLE_NDS_SUPPORT: "NO"
-        ENABLE_PS1_SUPPORT: "NO"
         ENABLE_GC_WII_SUPPORT: "NO"
         ENABLE_MSDOS_SUPPORT: "NO"
+        ENABLE_N3DS_SUPPORT: "NO"
+        ENABLE_NDS_ARM9_SUPPORT: "NO"
+        ENABLE_PS1_SUPPORT: "NO"
+        ENABLE_PS2_SUPPORT: "NO"
         ENABLE_WIN9X_SUPPORT: "NO"
         # dont install clang by default
         ENABLE_SWITCH_SUPPORT: "NO"
+        # dont install dosemu by default
         ENABLE_SATURN_SUPPORT: "NO"
+        # dont download macosx compilers by default
+        ENABLE_MACOSX_SUPPORT: "NO"
     cap_drop:
       - all
     cap_add:
       - setuid
       - setgid
       - setfcap
-    devices:
-      - "/dev/fuse:/dev/fuse"
     env_file:
       - backend/docker.dev.env
     ports: