From 148cf07d160383cf7fff28f4b77c539659238865 Mon Sep 17 00:00:00 2001
From: sjmiller609 <7516283+sjmiller609@users.noreply.github.com>
Date: Fri, 9 Oct 2026 16:34:28 +0000
Subject: [PATCH 1/2] Restore compatible Neko release image builds

---
 runtime/Dockerfile         | 1 +
 server/Dockerfile          | 8 +++++++-
 utils/xorg-deps/Dockerfile | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/runtime/Dockerfile b/runtime/Dockerfile
index b4c165eff..c49f2c3d6 100644
--- a/runtime/Dockerfile
+++ b/runtime/Dockerfile
@@ -11,6 +11,7 @@ ARG USER_GID=$USER_UID
 # install dependencies
 ENV DEBIAN_FRONTEND=noninteractive
 RUN set -eux; \
+    sed -i 's|deb.debian.org/debian-security|archive.debian.org/debian-security|g' /etc/apt/sources.list; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         wget ca-certificates python2 supervisor \
diff --git a/server/Dockerfile b/server/Dockerfile
index 1aacd0b45..b0d8bb45d 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,14 +1,20 @@
-ARG BASE_IMAGE=golang:1.25.0
+ARG BASE_IMAGE=debian:bullseye-slim
+FROM golang:1.25.0 AS go-toolchain
 FROM $BASE_IMAGE AS server
 
+COPY --from=go-toolchain /usr/local/go /usr/local/go
+ENV GOPATH=/go
+ENV PATH=/usr/local/go/bin:$PATH
 WORKDIR /src
 
 #
 # install dependencies
 ENV DEBIAN_FRONTEND=noninteractive
 RUN set -eux; \
+    sed -i 's|deb.debian.org/debian-security|archive.debian.org/debian-security|g' /etc/apt/sources.list; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        build-essential pkg-config git wget ca-certificates \
         libx11-dev libxrandr-dev libxtst-dev libgtk-3-dev \
         libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; \
     #
diff --git a/utils/xorg-deps/Dockerfile b/utils/xorg-deps/Dockerfile
index 9907893f2..9b7852ced 100644
--- a/utils/xorg-deps/Dockerfile
+++ b/utils/xorg-deps/Dockerfile
@@ -5,6 +5,7 @@ WORKDIR /xorg
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN set -eux; \
+    sed -i 's|deb.debian.org/debian-security|archive.debian.org/debian-security|g' /etc/apt/sources.list; \
     apt-get update; \
     apt-get install -y \
         git gcc pkgconf autoconf automake libtool make xorg-dev xutils-dev \

From 1745c26df636adffbbccb13e45680860d61307c0 Mon Sep 17 00:00:00 2001
From: sjmiller609 <7516283+sjmiller609@users.noreply.github.com>
Date: Fri, 9 Oct 2026 17:26:39 +0000
Subject: [PATCH 2/2] Keep the Neko build toolchain pinned

---
 server/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/Dockerfile b/server/Dockerfile
index b0d8bb45d..1d309e97b 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -4,6 +4,7 @@ FROM $BASE_IMAGE AS server
 
 COPY --from=go-toolchain /usr/local/go /usr/local/go
 ENV GOPATH=/go
+ENV GOTOOLCHAIN=local
 ENV PATH=/usr/local/go/bin:$PATH
 WORKDIR /src