add support for using a particular apt component

This provides a more flexible component, rather than hardcoded version+build

Author: razvancrainea

.github/actions/docker-opensips-publish/action.yml

@@ -8,6 +8,9 @@ inputs:
   tag:
     description: The Docker tag to publish the image
     required: false
+  component:
+    description: The apt component to pull the OpenSIPS deb from
+    required: false
   cli:
     description: Indicates whether to install OpenSIPS CLI as well
     required: false
@@ -40,6 +43,7 @@ runs:
       test -n "${{ inputs.cli }}" && echo "OPENSIPS_CLI=${{ inputs.cli }}" >> $GITHUB_ENV || true
       test -n "${{ inputs.modules }}" && echo "OPENSIPS_EXTRA_MODULES='${{ inputs.modules }}'" >> $GITHUB_ENV || true
       test -n "${{ inputs.build }}" && echo "OPENSIPS_BUILD=\"${{ inputs.build }}\"" >> $GITHUB_ENV || true
+      test -n "${{ inputs.component }}" && echo "OPENSIPS_COMPONENT=\"${{ inputs.component }}\"" >> $GITHUB_ENV || true
 
   - name: Build the Docker image
     shell: bash

.github/workflows/docker-opensips-publish.yml

@@ -18,6 +18,9 @@ on:
         description: Apt package build
         required: false
         default: releases
+      component:
+        description: Apt deb component
+        required: false
       modules:
         description: Extra Modules
         required: false
@@ -37,5 +40,6 @@ jobs:
         cli: ${{ github.event.inputs.cli }}
         modules: ${{ github.event.inputs.modules }}
         build: ${{ github.event.inputs.build }}
+        component: ${{ github.event.inputs.component }}
         docker-username: ${{ secrets.DOCKER_USERNAME }}
         docker-token: ${{ secrets.DOCKER_TOKEN }}

Dockerfile

@@ -10,13 +10,17 @@ ARG OPENSIPS_VERSION=3.4
 ARG OPENSIPS_VERSION_MINOR
 ARG OPENSIPS_VERSION_REVISION=1
 ARG OPENSIPS_BUILD=releases
+ARG OPENSIPS_COMPONENT
 
 #install basic components
 RUN apt-get -y update -qq && apt-get -y install gnupg2 ca-certificates
 
 #add keyserver, repository
 RUN apt-key adv --fetch-keys https://apt.opensips.org/pubkey.gpg
-RUN echo "deb https://apt.opensips.org bullseye ${OPENSIPS_VERSION}-${OPENSIPS_BUILD}" >/etc/apt/sources.list.d/opensips.list
+RUN echo "deb https://apt.opensips.org bullseye \
+		$(test -z "${OPENSIPS_COMPONENT}" && \
+				echo ${OPENSIPS_VERSION}-${OPENSIPS_BUILD} || \
+				echo ${OPENSIPS_COMPONENT})" >/etc/apt/sources.list.d/opensips.list
 
 RUN apt-get -y update -qq && \
     apt-get -y install \

Makefile

@@ -3,6 +3,7 @@ OPENSIPS_VERSION ?= 3.4
 OPENSIPS_VERSION_MINOR ?=
 OPENSIPS_VERSION_REVISION ?=
 OPENSIPS_BUILD ?= releases
+OPENSIPS_COMPONENT ?=
 OPENSIPS_DOCKER_TAG ?= latest
 OPENSIPS_CLI ?= true
 OPENSIPS_EXTRA_MODULES ?=
@@ -19,6 +20,7 @@ build:
 		--build-arg=OPENSIPS_VERSION_MINOR=$(OPENSIPS_VERSION_MINOR) \
 		--build-arg=OPENSIPS_VERSION_REVISION=$(OPENSIPS_VERSION_REVISION) \
 		--build-arg=OPENSIPS_CLI=${OPENSIPS_CLI} \
+		--build-arg=OPENSIPS_COMPONENT=${OPENSIPS_COMPONENT} \
 		--build-arg=OPENSIPS_EXTRA_MODULES="$(OPENSIPS_EXTRA_MODULES)" \
 		$(DOCKER_ARGS) \
 		--tag="opensips/opensips:$(OPENSIPS_DOCKER_TAG)" \

README.md

@@ -34,6 +34,7 @@ You can set different variables to tune your deployment:
  * `OPENSIPS_DOCKER_TAG` - indicates the docker tag (Default: `latest`)
  * `OPENSIPS_CLI` - specifies whether to install opensips-cli (`true`) or not (`false`) (Default: `true`)
  * `OPENSIPS_EXTRA_MODULES` - specifies extra opensips modules to install (Default: no other module)
+ * `OPENSIPS_COMPONENT` - specifies the opensips apt component to install (Default: ${OPENSIPS_VERSION}-${OPENSIPS_BUILD})
 
 ## Packages on DockerHub