Refactor Dockerfiles and update .dockerignore

Simplifies multi-stage Dockerfiles for Debian Trixie and Ubuntu by removing redundant native dependency stages and unifying build logic. Updates .dockerignore to remove exceptions for .rstcheck.cfg, add ignores for node_modules and non-Linux third-party dependencies, and deletes the unused .rstcheck.cfg config file.

Author: ReenigneArcher

.dockerignore

@@ -4,9 +4,6 @@
 # do not ignore .git, needed for versioning
 !/.git
 
-# do not ignore .rstcheck.cfg, needed to test building docs
-!/.rstcheck.cfg
-
 # ignore repo directories and files
 docker/
 gh-pages-template/
@@ -20,7 +17,17 @@ crowdin.yml
 # ignore dev directories
 build/
 cmake-*/
+node_modules/
 venv/
 
+# ignore pre-built deps for other platforms
+third-party/build-deps/dist/Darwin*
+third-party/build-deps/dist/FreeBSD*
+third-party/build-deps/dist/Windows*
+
+# ignore non Linux third-party submodules
+third-party/libdisplaydevice
+third-party/TPCircularBuffer
+
 # ignore artifacts
 artifacts/

.rstcheck.cfg

@@ -9,13 +9,8 @@ FROM ${BASE}:${TAG} AS sunshine-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-FROM sunshine-base AS sunshine-deps
-
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
 # Force this stage to run on the build platform for cross-compilation setup
-FROM --platform=$BUILDPLATFORM debian:trixie AS sunshine-deps-native
+FROM --platform=$BUILDPLATFORM ${BASE}:${TAG} AS sunshine-deps
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -41,19 +36,19 @@ if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
       target_tuple="x86_64-linux-gnu"
       ;;
     linux/arm64)
-      target_arch="arm64" 
+      target_arch="arm64"
       target_tuple="aarch64-linux-gnu"
       ;;
     *)
       echo "Unsupported target platform: ${TARGETPLATFORM}"
       exit 1
       ;;
   esac
-  
+
   # Enable multiarch support for cross-compilation
   dpkg --add-architecture ${target_arch}
   apt-get update
-  
+
   echo "Cross-compiling from ${BUILDPLATFORM} to ${TARGETPLATFORM}"
   echo "Target arch: ${target_arch}, Target triple: ${target_tuple}"
 else
@@ -74,7 +69,7 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
-FROM --platform=$BUILDPLATFORM sunshine-deps-native AS sunshine-build
+FROM --platform=$BUILDPLATFORM sunshine-deps AS sunshine-build
 
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
@@ -95,7 +90,7 @@ RUN <<_BUILD
 #!/bin/bash
 set -e
 
-# Set up cross-compilation variables if building for different platform  
+# Set up cross-compilation variables if building for different platform
 if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
   cross_compile="--cross-compile"
   case "${TARGETPLATFORM}" in
@@ -152,7 +147,7 @@ fi
   ${target_tuple:+--target-tuple=${target_tuple}}
 _BUILD
 
-FROM --platform=$TARGETPLATFORM sunshine-build AS sunshine-test
+FROM sunshine-build AS sunshine-test
 
 # This stage runs on the target architecture to avoid qemu overhead for tests
 ARG TARGETPLATFORM
@@ -167,7 +162,7 @@ Xvfb ${DISPLAY} -screen 0 1024x768x24 &
 ./test_sunshine --gtest_color=yes
 _TEST
 
-FROM --platform=$TARGETPLATFORM sunshine-base AS sunshine
+FROM sunshine-base AS sunshine
 
 ARG BASE
 ARG TAG

docker/debian-trixie.dockerfile

@@ -9,13 +9,8 @@ FROM ${BASE}:${TAG} AS sunshine-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-FROM sunshine-base AS sunshine-deps
-
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
 # Force this stage to run on the build platform for cross-compilation setup
-FROM --platform=$BUILDPLATFORM ubuntu:22.04 AS sunshine-deps-native
+FROM --platform=$BUILDPLATFORM ${BASE}:${TAG} AS sunshine-deps
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -40,19 +35,19 @@ if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
       target_tuple="x86_64-linux-gnu"
       ;;
     linux/arm64)
-      target_arch="arm64" 
+      target_arch="arm64"
       target_tuple="aarch64-linux-gnu"
       ;;
     *)
       echo "Unsupported target platform: ${TARGETPLATFORM}"
       exit 1
       ;;
   esac
-  
+
   # Enable multiarch support for cross-compilation
   dpkg --add-architecture ${target_arch}
   apt-get update
-  
+
   echo "Cross-compiling from ${BUILDPLATFORM} to ${TARGETPLATFORM}"
   echo "Target arch: ${target_arch}, Target triple: ${target_tuple}"
 else
@@ -73,7 +68,7 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
-FROM --platform=$BUILDPLATFORM sunshine-deps-native AS sunshine-build
+FROM --platform=$BUILDPLATFORM sunshine-deps AS sunshine-build
 
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
@@ -94,7 +89,7 @@ RUN <<_BUILD
 #!/bin/bash
 set -e
 
-# Set up cross-compilation variables if building for different platform  
+# Set up cross-compilation variables if building for different platform
 if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
   cross_compile="--cross-compile"
   case "${TARGETPLATFORM}" in
@@ -151,7 +146,7 @@ fi
   ${target_tuple:+--target-tuple=${target_tuple}}
 _BUILD
 
-FROM --platform=$TARGETPLATFORM sunshine-build AS sunshine-test
+FROM sunshine-build AS sunshine-test
 
 # This stage runs on the target architecture to avoid qemu overhead for tests
 ARG TARGETPLATFORM
@@ -166,7 +161,7 @@ Xvfb ${DISPLAY} -screen 0 1024x768x24 &
 ./test_sunshine --gtest_color=yes
 _TEST
 
-FROM --platform=$TARGETPLATFORM sunshine-base AS sunshine
+FROM sunshine-base AS sunshine
 
 ARG BASE
 ARG TAG

docker/ubuntu-22.04.dockerfile

@@ -9,13 +9,8 @@ FROM ${BASE}:${TAG} AS sunshine-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-FROM sunshine-base AS sunshine-deps
-
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
 # Force this stage to run on the build platform for cross-compilation setup
-FROM --platform=$BUILDPLATFORM ubuntu:24.04 AS sunshine-deps-native
+FROM --platform=$BUILDPLATFORM ${BASE}:${TAG} AS sunshine-deps
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -40,19 +35,19 @@ if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
       target_tuple="x86_64-linux-gnu"
       ;;
     linux/arm64)
-      target_arch="arm64" 
+      target_arch="arm64"
       target_tuple="aarch64-linux-gnu"
       ;;
     *)
       echo "Unsupported target platform: ${TARGETPLATFORM}"
       exit 1
       ;;
   esac
-  
+
   # Enable multiarch support for cross-compilation
   dpkg --add-architecture ${target_arch}
   apt-get update
-  
+
   echo "Cross-compiling from ${BUILDPLATFORM} to ${TARGETPLATFORM}"
   echo "Target arch: ${target_arch}, Target triple: ${target_tuple}"
 else
@@ -72,7 +67,7 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
-FROM --platform=$BUILDPLATFORM sunshine-deps-native AS sunshine-build
+FROM --platform=$BUILDPLATFORM sunshine-deps AS sunshine-build
 
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
@@ -93,7 +88,7 @@ RUN <<_BUILD
 #!/bin/bash
 set -e
 
-# Set up cross-compilation variables if building for different platform  
+# Set up cross-compilation variables if building for different platform
 if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then
   cross_compile="--cross-compile"
   case "${TARGETPLATFORM}" in
@@ -150,7 +145,7 @@ fi
   ${target_tuple:+--target-tuple=${target_tuple}}
 _BUILD
 
-FROM --platform=$TARGETPLATFORM sunshine-build AS sunshine-test
+FROM sunshine-build AS sunshine-test
 
 # This stage runs on the target architecture to avoid qemu overhead for tests
 ARG TARGETPLATFORM
@@ -165,7 +160,7 @@ Xvfb ${DISPLAY} -screen 0 1024x768x24 &
 ./test_sunshine --gtest_color=yes
 _TEST
 
-FROM --platform=$TARGETPLATFORM sunshine-base AS sunshine
+FROM sunshine-base AS sunshine
 
 ARG BASE
 ARG TAG