Skip to content

Commit e664e73

Browse files
Merge branch 'main' into add-podman-workaround-to-readme
2 parents 11e3779 + ebd1c6e commit e664e73

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

build_versions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
include:
33
- release: 8
44
# renovate: depName=openvox-server openVoxRelease=8
5-
server_version: "8.13.0-1+ubuntu24.04"
5+
server_version: "8.13.0-1+ubuntu26.04"
66
# renovate: depName=openvoxdb openVoxRelease=8
7-
db_version: "8.13.0-1+ubuntu24.04"
8-
r10k_version: "5.0.0"
7+
db_version: "8.13.0-1+ubuntu26.04"
8+
r10k_version: "5.0.3"
99
rugged_version: "1.9.0"
1010
jdk_version: "21"

openvoxserver/Containerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
ARG UBUNTU_VERSION=24.04
1+
ARG UBUNTU_VERSION=26.04
22
FROM ubuntu:${UBUNTU_VERSION} AS builder
33

4-
ARG BUILD_PKGS="ruby3.2-dev gcc make cmake pkg-config libssl-dev libc6-dev libssh2-1-dev"
5-
ARG R10K_VERSION=5.0.0
4+
ARG RUGGED_DEPS="libgit2-1.9 libjitterentropy3-dev libzstd-dev"
5+
ARG BUILD_PKGS="ruby3.3-dev gcc make cmake pkg-config libssl-dev libc6-dev libssh2-1-dev ${RUGGED_DEPS}"
6+
ARG R10K_VERSION=5.0.3
67
ARG RUGGED_VERSION=1.9.0
78

89
RUN apt-get update && \
@@ -15,11 +16,11 @@ FROM ubuntu:${UBUNTU_VERSION} AS final
1516
ARG vcs_ref
1617
ARG build_type
1718
ARG build_date
18-
ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init ruby3.2"
19-
ARG UBUNTU_VERSION=24.04
19+
ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init ruby3.3"
20+
ARG UBUNTU_VERSION=26.04
2021
ARG OPENVOX_RELEASE=8
21-
ARG OPENVOXSERVER_VERSION=8.8.0-1+ubuntu${UBUNTU_VERSION}
22-
ARG OPENVOXDB_VERSION=8.9.0-1+ubuntu${UBUNTU_VERSION}
22+
ARG OPENVOXSERVER_VERSION=8.13.0-1+ubuntu${UBUNTU_VERSION}
23+
ARG OPENVOXDB_VERSION=8.13.0-1+ubuntu${UBUNTU_VERSION}
2324
ARG OPENVOX_USER_UID=999
2425
ARG OPENVOX_USER_GID=999
2526
ARG OPENVOX_RELEASE_PACKAGE=openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb

0 commit comments

Comments
 (0)