Merge branch 'docker-rc-version' of 'https://github.com/jjmerchante/grimoirelab'

Merges #792
Closes #792

Author: sduenas

.github/workflows/docker-image.yml

@@ -94,6 +94,8 @@ jobs:
           context: "{{defaultContext}}:docker"
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            GRIMOIRELAB_RELEASE=${{ inputs.version }}
 
       - name: Sign the images with GitHub OIDC Token
         env:

.github/workflows/grimoirelab-release.yml

@@ -679,7 +679,7 @@ jobs:
           version=${{ steps.semverup.outputs.version }}
           dockerfile="docker/Dockerfile"
 
-          sed -i "s/ENV GRIMOIRELAB_RELEASE .*/ENV GRIMOIRELAB_RELEASE \"$version\"/" $dockerfile
+          sed -i "s/ARG GRIMOIRELAB_RELEASE=.*/ARG GRIMOIRELAB_RELEASE=\"$version\"/" $dockerfile
           git add $dockerfile
 
           cat $dockerfile

docker/Dockerfile

@@ -4,12 +4,14 @@
 FROM python:3.12-slim-bookworm
 LABEL maintainer="Santiago Dueñas <sduenas@bitergia.com>"
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEPLOY_USER grimoire
-ENV DEPLOY_USER_DIR /home/${DEPLOY_USER}
-ENV CONF_DIR ${DEPLOY_USER_DIR}/conf
-ENV SCRIPTS_DIR ${DEPLOY_USER_DIR}/scripts
-ENV GRIMOIRELAB_RELEASE "1.15.1"
+ARG GRIMOIRELAB_RELEASE="1.15.1"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEPLOY_USER=grimoire
+ENV DEPLOY_USER_DIR=/home/${DEPLOY_USER}
+ENV CONF_DIR=${DEPLOY_USER_DIR}/conf
+ENV SCRIPTS_DIR=${DEPLOY_USER_DIR}/scripts
+ENV GRIMOIRELAB_RELEASE=${GRIMOIRELAB_RELEASE}
 
 # Initial user
 RUN useradd ${DEPLOY_USER} --create-home --shell /bin/bash
@@ -22,6 +24,7 @@ RUN apt-get update && \
         git git-core \
         mariadb-client \
         libmariadbclient-dev-compat \
+        pkg-config \
         unzip curl wget sudo ssh \
         && \
     apt-get clean && \
@@ -41,10 +44,10 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
 #RUN CERT_PATH=`python3 -m requests.certs` && \
 #    cat ${DEPLOY_USER_DIR}/cacert.pem >> ${CERT_PATH}
 
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV LANG C.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=C.UTF-8
 
 # Download basic configuration files
 ADD https://raw.githubusercontent.com/chaoss/grimoirelab-sirmordred/main/aliases.json ${DEPLOY_USER_DIR}/aliases.json
@@ -70,4 +73,4 @@ RUN sudo pip install -r ${CONF_DIR}/requirements.txt
 
 HEALTHCHECK --interval=60s --timeout=6s --retries=1 CMD healthcheck.py -c ${CONF_DIR}/setup.cfg -s 'Exception in Task Manager' || exit 1
 
-CMD ${DEPLOY_USER_DIR}/stage
+CMD ["/bin/sh", "-c", "${DEPLOY_USER_DIR}/stage"]