From 28b2e66310cc668000bfab3cee812b4acb5d091b Mon Sep 17 00:00:00 2001
From: Robert Waffen <rw@betadots.de>
Date: Thu, 28 May 2026 15:54:49 +0200
Subject: [PATCH] feat: update ubuntu to 26.04

- add new rugged dependencies: libgit2-1.9 libjitterentropy3-dev libzstd-dev
- update package versions in build_versions to match ubuntu26
- update build_versions for r10k
- switch to jdk 25

Signed-off-by: Robert Waffen <rw@betadots.de>
---
 build_versions.yaml         |  6 +++---
 openvoxserver/Containerfile | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build_versions.yaml b/build_versions.yaml
index 707fb3b..ed2739b 100644
--- a/build_versions.yaml
+++ b/build_versions.yaml
@@ -2,9 +2,9 @@
 include:
   - release: 8
     # renovate: depName=openvox-server openVoxRelease=8
-    server_version: "8.13.0-1+ubuntu24.04"
+    server_version: "8.13.0-1+ubuntu26.04"
     # renovate: depName=openvoxdb openVoxRelease=8
-    db_version: "8.13.0-1+ubuntu24.04"
-    r10k_version: "5.0.0"
+    db_version: "8.13.0-1+ubuntu26.04"
+    r10k_version: "5.0.3"
     rugged_version: "1.9.0"
     jdk_version: "21"
diff --git a/openvoxserver/Containerfile b/openvoxserver/Containerfile
index 5f6bf47..6a75b24 100644
--- a/openvoxserver/Containerfile
+++ b/openvoxserver/Containerfile
@@ -1,8 +1,9 @@
-ARG UBUNTU_VERSION=24.04
+ARG UBUNTU_VERSION=26.04
 FROM ubuntu:${UBUNTU_VERSION} AS builder
 
-ARG BUILD_PKGS="ruby3.2-dev gcc make cmake pkg-config libssl-dev libc6-dev libssh2-1-dev"
-ARG R10K_VERSION=5.0.0
+ARG RUGGED_DEPS="libgit2-1.9 libjitterentropy3-dev libzstd-dev"
+ARG BUILD_PKGS="ruby3.3-dev gcc make cmake pkg-config libssl-dev libc6-dev libssh2-1-dev ${RUGGED_DEPS}"
+ARG R10K_VERSION=5.0.3
 ARG RUGGED_VERSION=1.9.0
 
 RUN apt-get update && \
@@ -15,11 +16,11 @@ FROM ubuntu:${UBUNTU_VERSION} AS final
 ARG vcs_ref
 ARG build_type
 ARG build_date
-ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init ruby3.2"
-ARG UBUNTU_VERSION=24.04
+ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init ruby3.3"
+ARG UBUNTU_VERSION=26.04
 ARG OPENVOX_RELEASE=8
-ARG OPENVOXSERVER_VERSION=8.8.0-1+ubuntu${UBUNTU_VERSION}
-ARG OPENVOXDB_VERSION=8.9.0-1+ubuntu${UBUNTU_VERSION}
+ARG OPENVOXSERVER_VERSION=8.13.0-1+ubuntu${UBUNTU_VERSION}
+ARG OPENVOXDB_VERSION=8.13.0-1+ubuntu${UBUNTU_VERSION}
 ARG OPENVOX_USER_UID=999
 ARG OPENVOX_USER_GID=999
 ARG OPENVOX_RELEASE_PACKAGE=openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb