Update 2.x Dockerfile and docker-compose

Update Dockerfile and docker-compose files for version upgrades
and configuration changes.

Signed-off-by: Jose Javier Merchante <[email protected]>

Author: jjmerchante

docker-compose/docker-compose-development.yml

@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
     mariadb:
       image: mariadb:11.4
@@ -13,21 +11,22 @@ services:
         retries: 5
 
     redis:
-      image: redis:7.4
+      image: redis:8
       ports:
         - "6379:6379"
       healthcheck:
         test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
         retries: 5
 
     opensearch-node1:
-      image: opensearchproject/opensearch:2.11.1
+      image: opensearchproject/opensearch:2.19.3
       environment:
         - cluster.name=opensearch-cluster
         - node.name=opensearch-node1
         - discovery.type=single-node
         - bootstrap.memory_lock=true
         - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
+        - OPENSEARCH_INITIAL_ADMIN_PASSWORD=Admin-Password-1234
       ulimits:
         memlock:
           soft: -1
@@ -40,7 +39,7 @@ services:
         - 9600:9600
 
     opensearch-dashboards:
-      image: opensearchproject/opensearch-dashboards:2.11.1
+      image: opensearchproject/opensearch-dashboards:2.19.3
       ports:
         - 5601:5601
       expose:

docker-compose/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
     mariadb:
       image: mariadb:11.4
@@ -13,7 +11,7 @@ services:
         retries: 5
 
     redis:
-      image: redis:7.4
+      image: redis:8
       expose:
         - "6379"
       healthcheck:
@@ -22,7 +20,7 @@ services:
 
     grimoirelab_core:
       restart: on-failure:3
-      image: grimoirelab/grimoirelab:dev
+      image: grimoirelab/grimoirelab:2.x
       environment:
         GRIMOIRELAB_DB_HOST: mariadb
         GRIMOIRELAB_DB_PORT: 3306
@@ -32,8 +30,6 @@ services:
         GRIMOIRELAB_REDIS_HOST: redis
         GRIMOIRELAB_REDIS_PORT: 6379
         GRIMOIRELAB_REDIS_PASSWORD: ""
-        GRIMOIRELAB_ARCHIVIST_WORKERS: 20
-        GRIMOIRELAB_ARCHIVIST_STORAGE_URL: "https://admin:admin@opensearch-node1:9200"
       expose:
         - "9314"
       volumes:
@@ -43,11 +39,11 @@ services:
           condition: service_healthy
         redis:
           condition: service_healthy
-      command: grimoirelab run server --clear-tasks
+      command: grimoirelab run server
 
     grimoirelab_core_eventizers:
       restart: on-failure:3
-      image: grimoirelab/grimoirelab:dev
+      image: grimoirelab/grimoirelab:2.x
       environment:
         GRIMOIRELAB_DB_HOST: mariadb
         GRIMOIRELAB_DB_PORT: 3306
@@ -57,7 +53,6 @@ services:
         GRIMOIRELAB_REDIS_HOST: redis
         GRIMOIRELAB_REDIS_PORT: 6379
         GRIMOIRELAB_REDIS_PASSWORD: ""
-        GRIMOIRELAB_ARCHIVIST_WORKERS: 20
       depends_on:
         mariadb:
           condition: service_healthy
@@ -67,7 +62,7 @@ services:
 
     grimoirelab_core_archivists:
       restart: on-failure:3
-      image: grimoirelab/grimoirelab:dev
+      image: grimoirelab/grimoirelab:2.x
       environment:
         GRIMOIRELAB_DB_HOST: mariadb
         GRIMOIRELAB_DB_PORT: 3306
@@ -77,7 +72,9 @@ services:
         GRIMOIRELAB_REDIS_HOST: redis
         GRIMOIRELAB_REDIS_PORT: 6379
         GRIMOIRELAB_REDIS_PASSWORD: ""
-        GRIMOIRELAB_ARCHIVIST_WORKERS: 20
+        GRIMOIRELAB_ARCHIVIST_STORAGE_URL: "https://opensearch-node1:9200"
+        GRIMOIRELAB_ARCHIVIST_STORAGE_USERNAME: "admin"
+        GRIMOIRELAB_ARCHIVIST_STORAGE_PASSWORD: "Admin-Password-1234"
       depends_on:
         mariadb:
           condition: service_healthy
@@ -106,7 +103,7 @@ services:
       expose:
         - "9314"
       volumes:
-        - sortinghat-static:/opt/venv/lib/python3.9/site-packages/sortinghat/static/
+        - sortinghat-static:/opt/venv/lib/python3.12/site-packages/sortinghat/static/
       depends_on:
         mariadb:
           condition: service_healthy
@@ -131,13 +128,14 @@ services:
           condition: service_healthy
 
     opensearch-node1:
-      image: opensearchproject/opensearch:2.11.1
+      image: opensearchproject/opensearch:2.19.3
       environment:
         - cluster.name=opensearch-cluster
         - node.name=opensearch-node1
         - discovery.type=single-node
         - bootstrap.memory_lock=true
         - "OPENSEARCH_JAVA_OPTS=-Xms2g -Xmx2g"
+        - OPENSEARCH_INITIAL_ADMIN_PASSWORD=Admin-Password-1234
       ulimits:
         memlock:
           soft: -1
@@ -150,7 +148,7 @@ services:
         - 9600:9600
 
     opensearch-dashboards:
-      image: opensearchproject/opensearch-dashboards:2.11.1
+      image: opensearchproject/opensearch-dashboards:2.19.3
       ports:
         - 5601:5601
       expose:

docker/Dockerfile

@@ -1,25 +1,16 @@
 # Copyright (C) 2016-2022 Bitergia
 # GPLv3 License
 
-FROM node:18 AS build-core-static
-
-RUN git clone --depth 1 https://github.com/chaoss/grimoirelab-core.git
-
-WORKDIR /grimoirelab-core/ui
-
-RUN yarn install && yarn build
-
-
-FROM python:3.11-slim-bullseye
+FROM python:3.12-slim-bullseye
 
 LABEL maintainer="Santiago Dueñas <[email protected]>"
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEPLOY_USER grimoirelab
-ENV DEPLOY_USER_DIR /home/${DEPLOY_USER}
-ENV CONF_DIR ${DEPLOY_USER_DIR}/conf
-ENV SCRIPTS_DIR ${DEPLOY_USER_DIR}/scripts
-ENV GRIMOIRELAB_RELEASE "2.x"
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEPLOY_USER=grimoirelab
+ENV DEPLOY_USER_DIR=/home/${DEPLOY_USER}
+ENV CONF_DIR=${DEPLOY_USER_DIR}/conf
+ENV SCRIPTS_DIR=${DEPLOY_USER_DIR}/scripts
+ENV GRIMOIRELAB_RELEASE="2.x"
 
 # Create a user and a group
 RUN groupadd -r $DEPLOY_USER && useradd -r -m -g $DEPLOY_USER $DEPLOY_USER
@@ -32,9 +23,19 @@ RUN apt-get update && \
         git git-core \
         mariadb-client \
         libmariadbclient-dev-compat \
-        unzip curl wget sudo ssh \
-        && \
-    apt-get clean && \
+        unzip curl wget sudo ssh
+
+# Install nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
+    apt-get install -y nodejs
+
+# Install yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends yarn
+
+RUN apt-get clean && \
     find /var/lib/apt/lists -type f -delete
 
 RUN echo "${DEPLOY_USER} ALL=NOPASSWD: ALL" >> /etc/sudoers
@@ -44,10 +45,10 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.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
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=C.UTF-8
 
 USER ${DEPLOY_USER}
 
@@ -78,12 +79,11 @@ RUN python -m venv /opt/venv/ && \
     poetry update && \
     poetry install
 
-COPY --from=build-core-static /grimoirelab-core/src/grimoirelab/core/templates/ /opt/venv/lib/python3.11/site-packages/grimoirelab/core/templates/
-
 RUN chown -R $DEPLOY_USER:$DEPLOY_USER /opt/venv
 
+# Make static files available in a known location
 RUN mkdir /core_static/
-COPY --from=build-core-static /grimoirelab-core/src/grimoirelab/core/templates/static/ /core_static/
+RUN cp -r /opt/venv/lib/python3.12/site-packages/grimoirelab/core/templates/static/. /core_static/
 RUN chown -R $DEPLOY_USER:$DEPLOY_USER /core_static/
 
 COPY ./entrypoint.sh /usr/local/bin/

docker/entrypoint.sh

@@ -24,20 +24,16 @@ set -e
 export GRIMOIRELAB_CONFIG="${GRIMOIRELAB_CONFIG:-grimoirelab.core.config.settings}"
 
 check_service() {
-    django-admin check --settings=$GRIMOIRELAB_CONFIG --database default > /dev/null 2>&1
+    django-admin check --settings="$GRIMOIRELAB_CONFIG" --database default > /dev/null 2>&1
     return $?
 }
 
-# Only if the command is grimoirelab, setup the database
+# If running `grimoirelab run`, always ensure the database is up-to-date.
+# Otherwise, only set it up if the check fails.
 if [ "$1" = 'grimoirelab' ]; then
-    if ! check_service ; then
+  if [ "$2" = 'run' ] || ! check_service; then
         grimoirelab admin setup
-
-        if [ "$?" -ne "0" ]; then
-            echo "GrimoireLab core setup failed."
-            return 1
-        fi
-    fi
+  fi
 fi
 
 exec "$@"