Refresh Docker image for post-Bullseye (maintaining compatibility with and defaulting to it) (#26)

* Refresh Docker image for post-Bullseye (maintaining compatibility with and default to it)

* Document new option accordingly

Author: jwarnier

Dockerfile

@@ -1,4 +1,5 @@
-FROM debian:bullseye AS base
+ARG DEBIAN_RELEASE=bullseye
+FROM debian:${DEBIAN_RELEASE} AS base
 LABEL maintainer="Razvan Crainea <razvan@opensips.org>"
 
 USER root
@@ -13,11 +14,12 @@ ARG OPENSIPS_BUILD=releases
 ARG OPENSIPS_COMPONENT
 
 #install basic components
-RUN apt-get -y update -qq && apt-get -y install gnupg2 ca-certificates
+RUN apt-get -y update -qq && apt-get -y install gnupg ca-certificates curl
 
 #add keyserver, repository
-RUN apt-key adv --fetch-keys https://apt.opensips.org/pubkey.gpg
-RUN echo "deb https://apt.opensips.org bullseye \
+RUN curl https://apt.opensips.org/opensips-org.gpg -o /usr/share/keyrings/opensips-org.gpg
+RUN DEBIAN_RELEASE=$(grep VERSION_CODENAME /etc/os-release | cut -f2 -d '=') && \
+    echo "deb [signed-by=/usr/share/keyrings/opensips-org.gpg] https://apt.opensips.org ${DEBIAN_RELEASE} \
 		$(test -z "${OPENSIPS_COMPONENT}" && \
 				echo ${OPENSIPS_VERSION}-${OPENSIPS_BUILD} || \
 				echo ${OPENSIPS_COMPONENT})" >/etc/apt/sources.list.d/opensips.list
@@ -30,7 +32,8 @@ ARG OPENSIPS_CLI=false
 ENV OPENSIPS_CLI_ENV=${OPENSIPS_CLI}
 
 RUN if [ ${OPENSIPS_CLI} = true ]; then \
-    echo "deb https://apt.opensips.org bullseye cli-nightly" >/etc/apt/sources.list.d/opensips-cli.list \
+    DEBIAN_RELEASE=$(grep VERSION_CODENAME /etc/os-release | cut -f2 -d '=') && \
+    echo "deb https://apt.opensips.org ${DEBIAN_RELEASE} cli-nightly" >/etc/apt/sources.list.d/opensips-cli.list \
     && apt-get -y update -qq && apt-get -y install opensips-cli \
     ;fi
 
@@ -39,7 +42,7 @@ RUN if [ -n "${OPENSIPS_EXTRA_MODULES}" ]; then \
     apt-get -y install ${OPENSIPS_EXTRA_MODULES} \
     ;fi
 
-RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN sed -i "s/stderror_enabled=no/stderror_enabled=yes/g" /etc/opensips/opensips.cfg && \
     sed -i "s/syslog_enabled=yes/syslog_enabled=no/g" /etc/opensips/opensips.cfg
 

Makefile

@@ -1,7 +1,8 @@
 NAME ?= opensips
+DEBIAN_RELEASE ?= bullseye
 OPENSIPS_VERSION ?= 3.4
 OPENSIPS_VERSION_MINOR ?=
-OPENSIPS_VERSION_REVISION ?=
+OPENSIPS_VERSION_REVISION ?= 1
 OPENSIPS_BUILD ?= releases
 OPENSIPS_COMPONENT ?=
 OPENSIPS_DOCKER_TAG ?= latest
@@ -25,6 +26,7 @@ build:
 	docker build \
 		--no-cache \
 		--target=$(DOCKER_TARGET) \
+		--build-arg=DEBIAN_RELEASE=$(DEBIAN_RELEASE) \
 		--build-arg=OPENSIPS_BUILD=$(OPENSIPS_BUILD) \
 		--build-arg=OPENSIPS_VERSION=$(OPENSIPS_VERSION) \
 		--build-arg=OPENSIPS_VERSION_MINOR=$(OPENSIPS_VERSION_MINOR) \

README.md

@@ -12,7 +12,7 @@ make build
 This command will build a docker image with OpenSIPS master version taken from
 the git repository. To build a different git version, you can run:
 ```
-OPENSIPS_VERSION=2.2 make build
+OPENSIPS_VERSION=3.4 make build
 ```
 
 To build with MySQL support:
@@ -27,6 +27,7 @@ make start
 
 ## Variables
 You can set different variables to tune your deployment:
+ * `DEBIAN_RELEASE` - sets the base image Debian release (Default: `bullseye`)
  * `OPENSIPS_VERSION` - sets the opensips version (Default: `3.4`)
  * `OPENSIPS_VERSION_MINOR` - forces a specific minor version of opensips (Default: not used, latest will be installed)
  * `OPENSIPS_VERSION_REVISION` - forces a specific revision/build of opensips; only taken into consideration if `OPENSIPS_VERSION_MINOR` is provided (Default: 1)