Merge pull request #11 from bootc/fixes/openvoxdb-termini

Re-add OpenVoxDB Termini

Author: rwaffen

.github/workflows/build_container.yml

@@ -36,6 +36,7 @@ jobs:
           build_args: |
             OPENVOX_RELEASE=${{ matrix.release }}
             OPENVOXSERVER_VERSION=${{ matrix.server_version }}
+            OPENVOXDB_VERSION=${{ matrix.db_version }}
             R10K_VERSION=${{ matrix.r10k_version }}
             RUGGED_VERSION=${{ matrix.rugged_version }}
           build_arch: linux/amd64
@@ -60,6 +61,7 @@ jobs:
           build_args: |
             OPENVOX_RELEASE=${{ matrix.release }}
             OPENVOXSERVER_VERSION=${{ matrix.server_version }}
+            OPENVOXDB_VERSION=${{ matrix.db_version }}
             R10K_VERSION=${{ matrix.r10k_version }}
             RUGGED_VERSION=${{ matrix.rugged_version }}
           build_arch: linux/arm64

.github/workflows/ci.yaml

@@ -51,6 +51,7 @@ jobs:
           build-args: |
             OPENVOX_RELEASE=${{ matrix.release }}
             OPENVOXSERVER_VERSION=${{ matrix.server_version }}
+            OPENVOXDB_VERSION=${{ matrix.db_version }}
             R10K_VERSION=${{ matrix.r10k_version }}
             RUGGED_VERSION=${{ matrix.rugged_version }}
 

.github/workflows/security_scanning.yml

@@ -45,6 +45,7 @@ jobs:
           build-args: |
             OPENVOX_RELEASE=${{ matrix.release }}
             OPENVOXSERVER_VERSION=${{ matrix.server_version }}
+            OPENVOXDB_VERSION=${{ matrix.db_version }}
             R10K_VERSION=${{ matrix.r10k_version }}
             RUGGED_VERSION=${{ matrix.rugged_version }}
 

build_versions.json

@@ -3,6 +3,7 @@
     {
       "release": 8,
       "server_version": "8.8.0",
+      "db_version": "8.9.0",
       "r10k_version": "5.0.0",
       "rugged_version": "1.9.0"
     }

openvoxserver/Containerfile

@@ -19,6 +19,7 @@ ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init"
 ARG TARGETARCH
 ARG OPENVOX_RELEASE=8
 ARG OPENVOXSERVER_VERSION=8.8.0
+ARG OPENVOXDB_VERSION=8.9.0
 ARG OPENVOX_USER_UID=999
 ARG OPENVOX_USER_GID=999
 ARG UBUNTU_VERSION=24.04
@@ -88,7 +89,11 @@ RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
     chmod +x /docker-entrypoint.sh /healthcheck.sh /docker-entrypoint.d/*.sh && \
     apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y $PACKAGES openvox-server=${OPENVOXSERVER_VERSION}-* && \
+    apt-get install -y \
+        $PACKAGES \
+        openvoxdb-termini=${OPENVOXDB_VERSION}-* \
+        openvox-server=${OPENVOXSERVER_VERSION}-* \
+        && \
     apt-get autoremove -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \