Merged in task/dspace-cris-2025_02_x/DSC-2745 (pull request DSpace#4115)

DSC-2745

Approved-by: Giuseppe Digilio

Author: vins01-4science

Dockerfile

@@ -21,4 +21,6 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
 ENV NODE_ENV=development
+ENV CI=true
+ENV NO_COLOR=1
 CMD npm run serve -- --host 0.0.0.0

Dockerfile.dependencies

@@ -9,10 +9,12 @@ ARG DOCKER_REGISTRY=docker.io
 FROM docker.io/node:${NODE_VERSION-22}-alpine AS dependencies
 
 # Install build dependencies
-RUN apk add --no-cache python3 make g++
+# RUN apk add --no-cache python3 make g++
 
 WORKDIR /app
 
 # Install dependencies (use npm ci if you have package-lock.json)
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --network-timeout 300000
+COPY package*.json ./
+
+RUN --mount=type=cache,target=/root/.npm \
+  npm ci

docker/cli.assetstore.yml

@@ -16,10 +16,10 @@ services:
   dspace-cli:
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      - LOADASSETS=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/assetstore.tar.gz
+      - LOADASSETS=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/assetstore.tar.gz
     entrypoint:
       - /bin/bash
-      - '-c'
+      - "-c"
       - |
         if [ ! -z $${LOADASSETS} ]
         then

docker/db.entities.yml

@@ -17,9 +17,9 @@ services:
     image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-postgres-pgcrypto:${DSPACE_VER:-dspace-cris-2025_02_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in 4Science/DSpace
-      # This SQL is available from https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
+      # This SQL is available from https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/db-entities.sql
       # NOTE: currently there is no dspace8 version
-      - LOADSQL=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
+      - LOADSQL=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/db-entities.sql
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
     # Ensure that the database is ready BEFORE starting tomcat
@@ -31,7 +31,7 @@ services:
     # 4. Finally, start DSpace
     entrypoint:
       - /bin/bash
-      - '-c'
+      - "-c"
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored

docker/docker-compose-ci.yml

@@ -26,37 +26,37 @@ services:
       dspace__P__server__P__url: http://127.0.0.1:8080/server
       dspace__P__ui__P__url: http://127.0.0.1:4000
       # db.url: Ensure we are using the 'dspacedb' image for our database
-      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      db__P__url: "jdbc:postgresql://dspacedb:5432/dspace"
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
-      solr__D__statistics__P__autoCommit: 'false'
+      solr__D__statistics__P__autoCommit: "false"
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
     image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris:${DSPACE_VER:-dspace-cris-2025_02_x}-test"
     depends_on:
-    - dspacedb
+      - dspacedb
     networks:
       - dspacenet
     ports:
-    - published: 8080
-      target: 8080
+      - published: 8080
+        target: 8080
     stdin_open: true
     tty: true
     volumes:
-    - assetstore:/dspace/assetstore
+      - assetstore:/dspace/assetstore
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
     # 3. Finally, start DSpace
     entrypoint:
-    - /bin/bash
-    - '-c'
-    - |
-      /dspace/bin/dspace database repair
-      /dspace/bin/dspace database migrate
-      /dspace/bin/dspace database migrate ignored
-      java -XX:+UseParallelGC -XX:MaxRAMPercentage=75 org.springframework.boot.loader.launch.JarLauncher
+      - /bin/bash
+      - "-c"
+      - |
+        /dspace/bin/dspace database repair
+        /dspace/bin/dspace database migrate
+        /dspace/bin/dspace database migrate ignored
+        java -XX:+UseParallelGC -XX:MaxRAMPercentage=75 org.springframework.boot.loader.launch.JarLauncher
   # DSpace database container
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
@@ -67,59 +67,59 @@ services:
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       # NOTE: currently there is no dspace8 version
-      LOADSQL: https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
+      LOADSQL: https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/db-entities.sql
       PGDATA: /pgdata
       POSTGRES_DB: dspace
       POSTGRES_USER: dspace
       POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet
     ports:
-    - published: 5432
-      target: 5432
+      - published: 5432
+        target: 5432
     stdin_open: true
     tty: true
     volumes:
-     # Keep Postgres data directory between reboots
-    - pgdata:/pgdata
+      # Keep Postgres data directory between reboots
+      - pgdata:/pgdata
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
     image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-solr:${DSPACE_VER:-dspace-cris-2025_02_x}"
     networks:
       - dspacenet
     ports:
-    - published: 8983
-      target: 8983
+      - published: 8983
+        target: 8983
     stdin_open: true
     tty: true
     working_dir: /var/solr/data
     volumes:
-    # Keep Solr data directory between reboots
-    - solr_data:/var/solr/data
+      # Keep Solr data directory between reboots
+      - solr_data:/var/solr/data
     # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
     entrypoint:
-    - /bin/bash
-    - '-c'
-    - |
-      init-var-solr
-      precreate-core authority /opt/solr/server/solr/configsets/authority
-      cp -r /opt/solr/server/solr/configsets/authority/* authority
-      precreate-core oai /opt/solr/server/solr/configsets/oai
-      cp -r /opt/solr/server/solr/configsets/oai/* oai
-      precreate-core search /opt/solr/server/solr/configsets/search
-      cp -r /opt/solr/server/solr/configsets/search/* search
-      precreate-core statistics /opt/solr/server/solr/configsets/statistics
-      cp -r /opt/solr/server/solr/configsets/statistics/* statistics
-      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
-      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
-      precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
-      cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
-      precreate-core dedup /opt/solr/server/solr/configsets/dedup
-      cp -r /opt/solr/server/solr/configsets/dedup/* dedup
-      precreate-core audit /opt/solr/server/solr/configsets/audit
-      cp -r /opt/solr/server/solr/configsets/audit/* audit
-      exec solr -f
+      - /bin/bash
+      - "-c"
+      - |
+        init-var-solr
+        precreate-core authority /opt/solr/server/solr/configsets/authority
+        cp -r /opt/solr/server/solr/configsets/authority/* authority
+        precreate-core oai /opt/solr/server/solr/configsets/oai
+        cp -r /opt/solr/server/solr/configsets/oai/* oai
+        precreate-core search /opt/solr/server/solr/configsets/search
+        cp -r /opt/solr/server/solr/configsets/search/* search
+        precreate-core statistics /opt/solr/server/solr/configsets/statistics
+        cp -r /opt/solr/server/solr/configsets/statistics/* statistics
+        precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+        cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
+        precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
+        cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
+        precreate-core dedup /opt/solr/server/solr/configsets/dedup
+        cp -r /opt/solr/server/solr/configsets/dedup/* dedup
+        precreate-core audit /opt/solr/server/solr/configsets/audit
+        cp -r /opt/solr/server/solr/configsets/audit/* audit
+        exec solr -f
 volumes:
   assetstore:
   pgdata: