Skip to content

Commit 935eef7

Browse files
committed
fix: add JDK version support to build workflows and Containerfile
1 parent 6abf48b commit 935eef7

5 files changed

Lines changed: 10 additions & 1 deletion

File tree

.github/workflows/build_container.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
OPENVOXDB_VERSION=${{ matrix.db_version }}
5757
R10K_VERSION=${{ matrix.r10k_version }}
5858
RUGGED_VERSION=${{ matrix.rugged_version }}
59+
JDK_VERSION=${{ matrix.jdk_version }}
5960
build_arch: linux/${{ matrix.platform }}
6061
build_context: openvoxserver
6162
buildfile: openvoxserver/Containerfile
@@ -71,6 +72,8 @@ jobs:
7172
OPENVOXSERVER_VERSION=${{ steps.server_version.outputs.server_version }}
7273
OPENVOXDB_VERSION=${{ steps.db_version.outputs.db_version }}
7374
R10K_VERSION=${{ matrix.r10k_version }}
75+
RUGGED_VERSION=${{ matrix.rugged_version }}
76+
JDK_VERSION=${{ matrix.jdk_version }}
7477
build_arch: linux/${{ matrix.platform }}
7578
build_context: openvoxserver
7679
buildfile: openvoxserver/Containerfile.alpine

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
OPENVOXDB_VERSION=${{ matrix.db_version }}
7272
R10K_VERSION=${{ matrix.r10k_version }}
7373
RUGGED_VERSION=${{ matrix.rugged_version }}
74+
JDK_VERSION=${{ matrix.jdk_version }}
7475
7576
- name: Build Alpine image
7677
uses: docker/build-push-action@v6
@@ -84,6 +85,8 @@ jobs:
8485
OPENVOXSERVER_VERSION=${{ steps.extract_server_version.outputs.server_version }}
8586
OPENVOXDB_VERSION=${{ steps.extract_db_version.outputs.db_version }}
8687
R10K_VERSION=${{ matrix.r10k_version }}
88+
RUGGED_VERSION=${{ matrix.rugged_version }}
89+
JDK_VERSION=${{ matrix.jdk_version }}
8790
8891
tests:
8992
needs:

.github/workflows/security_scanning.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
OPENVOXDB_VERSION=${{ matrix.db_version }}
6565
R10K_VERSION=${{ matrix.r10k_version }}
6666
RUGGED_VERSION=${{ matrix.rugged_version }}
67+
JDK_VERSION=${{ matrix.jdk_version }}
6768
6869
- name: Scan image with Anchore Grype
6970
uses: anchore/scan-action@v6

build_versions.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ include:
77
db_version: "8.9.1-1+ubuntu24.04"
88
r10k_version: "5.0.0"
99
rugged_version: "1.9.0"
10+
jdk_version: "17"

openvoxserver/Containerfile.alpine

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
FROM alpine:3.22 AS base
22

33
# Install JDK
4+
ARG JDK_VERSION=17
45
RUN apk update && apk upgrade \
5-
&& apk add --no-cache openjdk17-jre-headless bash
6+
&& apk add --no-cache openjdk${JDK_VERSION}-jre-headless bash
67

78
################################################################################
89

0 commit comments

Comments
 (0)