From 969eb0d534abc1e71f7461fa7677414a6e6df504 Mon Sep 17 00:00:00 2001
From: James Plante <jameswilliamplante@gmail.com>
Date: Mon, 10 Nov 2025 21:36:35 -0500
Subject: [PATCH] Now works with v2.4 update

- NGINX image bumped to 1.29
- Debian image now used Trixie as the base - moved over to named release instead of "stable" due to package renaming
---
 .gitignore       | 3 ++-
 Dockerfile       | 6 +++---
 compose.yml      | 2 +-
 nginx/Dockerfile | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c81359..c404f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 
 # Ignore all assets in data folder except for template, etc.
-data/*
+data/
+ringserv-template.cfg
 !data/_placeholder
 !data/ringserv-template.cfg
 !data/addons/_placeholder
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a669dd2..989654d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 #
 # Build stage
 #
-FROM debian:stable-slim AS rr-builder
+FROM debian:trixie-slim AS rr-builder
 ARG RR_VERSION
 
 # Install Essential Utilities
@@ -9,7 +9,7 @@ RUN apt-get update
 RUN apt-get install -y bash git curl unzip build-essential cmake ninja-build
 
 # Install dependencies
-RUN apt-get install -y libcurl4-openssl-dev libsdl2-dev zlib1g-dev libpng-dev libogg-dev libvorbis-dev libvpx-dev libyuv-dev
+RUN apt-get install -y libcurl4-openssl-dev libsdl2-dev zlib1g-dev libpng-dev libogg-dev libvorbis-dev libvpx-dev libyuv-dev libopus-dev
 
 # Clone the repo
 RUN mkdir /buildfiles
@@ -29,7 +29,7 @@ FROM debian:stable-slim AS rr-server
 ARG RR_VERSION
 
 # Install runtime dependencies
-RUN apt-get update && apt-get install --no-install-recommends -y bash curl libsdl2-2.0-0 zlib1g libpng16-16 libogg0 libvorbis0a libvpx7 libyuv0 
+RUN apt-get update && apt-get install --no-install-recommends -y bash curl libsdl2-2.0-0 zlib1g libpng16-16 libogg0 libvorbis0a libvpx9 libyuv0 libopus0
 
 # Create a 'ringracers' group and user
 RUN useradd ringracers
diff --git a/compose.yml b/compose.yml
index 2ccf549..d47e1a1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        - RR_VERSION=v2.3
+        - RR_VERSION=v2.4
     ports:
       - 5029:5029/udp
     volumes:
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index c6c8a4f..800081a 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.27-alpine
+FROM nginx:1.29-alpine
 EXPOSE 80
 COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file