Merge pull request #21 from OpenVoxProject/refactor_for_renovate

feat: refactor for renovate version automated updating

Author: rwaffen

.github/workflows/build_container.yml

@@ -17,8 +17,11 @@ jobs:
       - name: Source checkout
         uses: actions/checkout@v4
 
+      - name: 'Setup yq'
+        uses: dcarbone/[email protected]
+
       - id: set-matrix
-        run: echo "matrix=$(cat build_versions.json | jq -c)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
 
   build-X86-container:
     runs-on: ubuntu-24.04
@@ -89,13 +92,23 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Extract version number
+        id: extract_version
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const agentVersion = '${{ matrix.server_version }}';
+            const version = agentVersion.split('-')[0];
+            core.setOutput('version', version);
+
+
       - name: Create multi arch manifests
         run: |
-          docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.server_version }}-${{ github.ref_name }} \
+          docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.extract_version.outputs.version }}-${{ github.ref_name }} \
             ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
             ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
 
-          docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.server_version }}-latest \
+          docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.extract_version.outputs.version }}-latest \
             ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
             ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
 

.github/workflows/ci.yaml

@@ -16,8 +16,11 @@ jobs:
       - name: Source checkout
         uses: actions/checkout@v4
 
+      - name: 'Setup yq'
+        uses: dcarbone/[email protected]
+
       - id: set-matrix
-        run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
 
   general_ci:
     permissions:
@@ -41,10 +44,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Extract version number
+        id: extract_version
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const agentVersion = '${{ matrix.server_version }}';
+            const version = agentVersion.split('-')[0];
+            core.setOutput('version', version);
+
       - name: Build image
         uses: docker/build-push-action@v6
         with:
-          tags: 'ci/openvoxserver:${{ matrix.server_version }}'
+          tags: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}'
           context: openvoxserver
           file: openvoxserver/Containerfile
           push: false

.github/workflows/security_scanning.yml

@@ -18,8 +18,11 @@ jobs:
       - name: Source checkout
         uses: actions/checkout@v4
 
+      - name: 'Setup yq'
+        uses: dcarbone/[email protected]
+
       - id: set-matrix
-        run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
 
   scan_ci_container:
     name: 'Scan CI container'
@@ -35,10 +38,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Extract version number
+        id: extract_version
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const agentVersion = '${{ matrix.server_version }}';
+            const version = agentVersion.split('-')[0];
+            core.setOutput('version', version);
+
       - name: Build CI container
         uses: docker/build-push-action@v6
         with:
-          tags: 'ci/openvoxserver:${{ matrix.server_version }}'
+          tags: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}'
           context: openvoxserver
           file: openvoxserver/Containerfile
           push: false
@@ -53,7 +65,7 @@ jobs:
         uses: anchore/scan-action@v6
         id: scan
         with:
-          image: 'ci/openvoxserver:${{ matrix.server_version }}'
+          image: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}'
           fail-build: false
 
       - name: Inspect action SARIF report

build_versions.json

@@ -0,0 +1,17 @@
+---
+include:
+  - release: 7
+    # renovate: depName=openvox-server openVoxRelease=7
+    server_version: "7.18.1-1+ubuntu24.04"
+    # renovate: depName=openvoxdb openVoxRelease=7
+    db_version: "7.21.1-1+ubuntu24.04"
+    r10k_version: "4.1.0"
+    rugged_version: "1.9.0"
+
+  - release: 8
+    # renovate: depName=openvox-server openVoxRelease=8
+    server_version: "8.8.0-1+ubuntu24.04"
+    # renovate: depName=openvoxdb openVoxRelease=8
+    db_version: "8.9.0-1+ubuntu24.04"
+    r10k_version: "5.0.0"
+    rugged_version: "1.9.0"

build_versions.yaml

@@ -16,13 +16,13 @@ ARG vcs_ref
 ARG build_type
 ARG build_date
 ARG PACKAGES="git netbase openssh-client libssh2-1 dumb-init"
-ARG TARGETARCH
+ARG UBUNTU_VERSION=24.04
 ARG OPENVOX_RELEASE=8
-ARG OPENVOXSERVER_VERSION=8.8.0
-ARG OPENVOXDB_VERSION=8.9.0
+ARG OPENVOXSERVER_VERSION=8.8.0-1+ubuntu${UBUNTU_VERSION}
+ARG OPENVOXDB_VERSION=8.9.0-1+ubuntu${UBUNTU_VERSION}
 ARG OPENVOX_USER_UID=999
 ARG OPENVOX_USER_GID=999
-ARG UBUNTU_VERSION=24.04
+ARG OPENVOX_RELEASE_PACKAGE=openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb
 
 LABEL org.label-schema.maintainer="Voxpupuli Team <[email protected]>" \
       org.label-schema.vendor="OpenVoxProject" \
@@ -81,8 +81,8 @@ COPY --from=builder /usr/local/bin/r10k /usr/local/bin/
 
 ADD https://apt.overlookinfratech.com/openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb /
 RUN apt-get update && \
-    apt-get install -y ca-certificates /openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb && \
-    rm /openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb
+    apt-get install -y ca-certificates /${OPENVOX_RELEASE_PACKAGE} && \
+    rm /${OPENVOX_RELEASE_PACKAGE}
 
 RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
     useradd -m -u ${OPENVOX_USER_UID} -g puppet puppet && \
@@ -91,8 +91,8 @@ RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
     apt-get upgrade -y && \
     apt-get install -y \
         $PACKAGES \
-        openvoxdb-termini=${OPENVOXDB_VERSION}-* \
-        openvox-server=${OPENVOXSERVER_VERSION}-* \
+        openvoxdb-termini=${OPENVOXDB_VERSION} \
+        openvox-server=${OPENVOXSERVER_VERSION} \
         && \
     apt-get autoremove -y && \
     apt-get clean && \

openvoxserver/Containerfile

@@ -2,5 +2,14 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended"
+  ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": ["build_versions.yaml"],
+      "matchStrings": ["#\\s*renovate:\\s*depName=(?<depName>.*?)\\s*openVoxRelease=(?<openVoxRelease>\\d+)\\s*\\n\\s*(?<key>\\w+_version):\\s*\"(?<currentValue>.*?)\""],
+      "registryUrlTemplate": "https://apt.overlookinfratech.com?suite=ubuntu24.04&components=openvox{{openVoxRelease}}&binaryArch=amd64",
+      "datasourceTemplate": "deb"
+    }
   ]
 }