Merge branch 'future-dev' into feature/SWS2-13

Author: Dragos0000

.github/workflows/unit-tests-srv.yml

@@ -23,6 +23,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+#      # <-- ADDING THIS STEP TO SOLVE CACHE ISSUE -->
+#      - uses: actions/cache@v4
+#        with:
+#          path: |
+#            ~/.cache/pip
+#            .pytest_cache
+#          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+
       - name: Make envfile
         run: make staging-dotenv-file
 
@@ -55,7 +63,7 @@ jobs:
         run: mkdir -p $GITHUB_WORKSPACE/.scannerwork && chmod -R 777 $GITHUB_WORKSPACE/.scannerwork && pwd && ls -a
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarqube-scan-action@v4.1.0
+        uses: SonarSource/sonarqube-scan-action@v4.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

infra/aws/create-and-deploy-images.sh

@@ -1,7 +1,7 @@
 REGION=eu-west-1
-FUSEKI_IMAGE=docker.io/secoresearch/fuseki:4.5.0
-METABASE_IMAGE=docker.io/metabase/metabase:v0.44.6
-MONGO_EXPRESS_IMAGE=docker.io/mongo-express:0.54.0
+FUSEKI_IMAGE=docker.io/secoresearch/fuseki:5.3.0
+METABASE_IMAGE=docker.io/metabase/metabase:v0.53.6.6
+MONGO_EXPRESS_IMAGE=docker.io/mongo-express:1.0.2
 SFTP_IMAGE=docker.io/atmoz/sftp:debian
 
 

infra/fuseki/Dockerfile

@@ -1,12 +1,12 @@
-FROM docker.io/secoresearch/fuseki:4.5.0
+FROM docker.io/secoresearch/fuseki:5.3.0
 
 USER root
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends procps
+RUN apk update && \
+    apk add --no-cache procps
 
 
 # Create a non-root user and group
-RUN groupadd -r fuseki && useradd -r -g fuseki fuseki
+RUN addgroup -S fuseki && adduser -S fuseki -G fuseki
 
 # Ensure the /fuseki-base and /fuseki-data directories exist and set permissions
 RUN mkdir -p /fuseki-base /fuseki-data/databases /tmp && \

infra/metabase/docker-compose.yml

@@ -19,7 +19,7 @@ services:
   metabase:
     container_name: metabase-${ENVIRONMENT}
     restart: unless-stopped
-    image: metabase/metabase:v0.44.6
+    image: metabase/metabase:v0.53.6.6
     environment:
       - MB_DB_TYPE=postgres
       - MB_DB_DBNAME=${ENV_MB_DB_DBNAME}

infra/mongo/docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - 'traefik.enable=false'
 
   mongo-express:
-    image: mongo-express
+    image: mongo-express:1.0.2
     container_name: mongo-express-${ENVIRONMENT}
     environment:
       - ME_CONFIG_MONGODB_SERVER=mongodb-${ENVIRONMENT}