Merge remote-tracking branch 'bitbucket4science/task/main-cris/DSC-2193' into task/dspace-cris-2024_02_x/DSC-2193

# Conflicts:
#	yarn.lock

Author: atarix83

Dockerfile

@@ -1,20 +1,16 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM docker.io/node:18-alpine
+ARG NODE_VERSION=22
+ARG DSPACE_VERSION=2024_02_x
+ARG DOCKER_REGISTRY=docker.io
 
-# Ensure Python and other build tools are available
-# These are needed to install some node modules, especially on linux/arm64
-RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-2024_02_x} AS dev
 
 WORKDIR /app
 ADD . /app/
 EXPOSE 4000
 
-# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
-# See, for example https://github.com/yarnpkg/yarn/issues/5540
-RUN yarn install --network-timeout 300000
-
 # When running in dev mode, 4GB of memory is required to build & launch the app.
 # This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
 # See Docker environment var precedence: https://docs.docker.com/compose/environment-variables/envvars-precedence/
@@ -25,4 +21,4 @@ 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
-CMD yarn serve --host 0.0.0.0
+CMD ["yarn", "serve", "--host", "0.0.0.0"]

Dockerfile.dependencies

@@ -0,0 +1,18 @@
+# Test build:
+# docker build -f Dockerfile.dependencies -t 4science/dspace-angular-dependencies:2024_02_x .
+
+# Angular 17 + Node 22 optimized Dockerfile
+ARG NODE_VERSION=22
+ARG DSPACE_VERSION=2024_02_X
+ARG DOCKER_REGISTRY=docker.io
+
+FROM ${DOCKER_REGISTRY:-docker.io}/node:${NODE_VERSION-22}-alpine AS dependencies
+
+# Install build dependencies
+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 --network-timeout 300000

Dockerfile.dist

@@ -1,31 +1,40 @@
+# syntax=docker/dockerfile:1.7-labs
+
 # This image will be published as dspace/dspace-angular:$DSPACE_VERSION-dist
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
 
-FROM docker.io/node:18-alpine AS build
+# Angular 17 + Node 22 optimized Dockerfile
+ARG NODE_VERSION=22
+ARG DSPACE_VERSION=2024_02_x
+ARG DOCKER_REGISTRY=docker.io
+
+FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-2024_02_x} AS build
 
-# Ensure Python and other build tools are available
-# These are needed to install some node modules, especially on linux/arm64
-RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+COPY --parents src/** config/** webpack/** docker/dspace-ui.json angular.json server.ts startup-message.ts tsconfig.json tsconfig.app.json tsconfig.server.json tsconfig.spec.json tsconfig.ts-node.json typedoc.json /app/
 
 WORKDIR /app
-COPY package.json yarn.lock ./
-RUN yarn install --network-timeout 300000
 
-ADD . /app/
+# Build Angular app
 RUN yarn build:prod
 
-FROM node:18-alpine
-RUN npm install --global pm2
+# ---- Production image ----
+FROM ${DOCKER_REGISTRY:-docker.io}/node:${NODE_VERSION-22}-alpine AS prod
 
-COPY --chown=node:node --from=build /app/dist /app/dist
-COPY --chown=node:node config /app/config
-COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
+# Install pm2 globally and clean npm cache
+RUN npm install --global pm2 && npm cache clean --force
 
 WORKDIR /app
+
+# Only copy built files and config
+COPY --chown=node:node --from=build /app/dist /app/dist
+COPY --chown=node:node --from=build /app/config /app/config
+COPY --chown=node:node --from=build /app/docker/dspace-ui.json /app/dspace-ui.json
+
 USER node
 ENV NODE_ENV=production
 EXPOSE 4000
-CMD pm2-runtime start dspace-ui.json --json
+
+CMD ["pm2-runtime", "start", "dspace-ui.json", "--json"]

bitbucket-pipelines.yml

@@ -23,7 +23,7 @@ definitions:
 
 pipelines:
   branches:
-    'dspace-cris-2024_02_x':
+    'main-cris':
       - step: *unittest-code-checks
     'prod/**':
       - step: *unittest-code-checks

docker/README.md

@@ -3,11 +3,11 @@
 ***
 :warning: **THESE IMAGES ARE NOT PRODUCTION READY**  The below Docker Compose images/resources were built for development/testing only.  Therefore, they may not be fully secured or up-to-date, and should not be used in production.
 
-If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
+If you wish to run DSpace-CRIS on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
 ***
 
 ## Overview
-The scripts in this directory can be used to start the DSpace User Interface (frontend) in Docker.
+The scripts in this directory can be used to start the DSpace-CRIS User Interface (frontend) in Docker.
 Optionally, the backend (REST API) might also be started in Docker.
 
 For additional options/settings in starting the backend (REST API) in Docker, see the Docker Compose
@@ -20,17 +20,17 @@ the Docker compose scripts in this 'docker' folder.
 
 ### Dockerfile
 
-This Dockerfile is used to build a *development* DSpace Angular UI image, published as 'dspace/dspace-angular'
+This Dockerfile is used to build a *development* DSpace-CRIS Angular UI image, published as '4science/dspace-cris-angular'
 
 ```
-docker build -t dspace/dspace-angular:dspace-8_x .
+docker build -t 4science/dspace-cris-angular:2024_02_x .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:dspace-8_x
+docker push 4science/dspace-cris-angular:2024_02_x
 ```
 
 ### Dockerfile.dist
@@ -39,45 +39,45 @@ The `Dockerfile.dist` is used to generate a *production* build and runtime envir
 
 ```bash
 # build the latest image
-docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
+docker build -f Dockerfile.dist -t 4science/dspace-cris-angular:2024_02_x-dist .
 ```
 
 A default/demo version of this image is built *automatically*.
 
 ## 'docker' directory
 - docker-compose.yml
-  - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace REST instance will also be started in Docker.
+  - Starts DSpace-CRIS Angular with Docker Compose from the current branch.  This file assumes that a DSpace-CRIS REST instance will also be started in Docker.
 - docker-compose-rest.yml
-  - Runs a published instance of the DSpace REST API - persists data in Docker volumes
+  - Runs a published instance of the DSpace-CRIS REST API - persists data in Docker volumes
 - docker-compose-ci.yml
-  - Runs a published instance of the DSpace REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
+  - Runs a published instance of the DSpace-CRIS REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
 - cli.yml
-  - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
+  - Docker compose file that provides a DSpace-CRIS CLI container to work with a running DSpace-CRIS REST container.
 - cli.assetstore.yml
-  - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
+  - Docker compose file that will download and install data into a DSpace-CRIS REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
 
 
-## To refresh / pull DSpace images from Dockerhub
+## To refresh / pull DSpace-CRIS images from Dockerhub
 ```
 docker compose -f docker/docker-compose.yml pull
 ```
 
-## To build DSpace images using code in your branch
+## To build DSpace-CRIS images using code in your branch
 ```
 docker compose -f docker/docker-compose.yml build
 ```
 
-## To start DSpace (REST and Angular) from your branch
+## To start DSpace-CRIS (REST and Angular) from your branch
 
 This command provides a quick way to start both the frontend & backend from this single codebase
 ```
-docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
+docker compose -p c24 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
 ```
 
 Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
 
 
-## Run DSpace REST and DSpace Angular from local branches.
+## Run DSpace-CRIS REST and DSpace-CRIS Angular from local branches.
 
 This section assumes that you have clones *both* the 'DSpace/DSpace' and 'DSpace/dspace-angular' GitHub
 repositories. When both are available locally, you can spin up both in Docker and have them work together.
@@ -86,59 +86,59 @@ _The system will be started in 2 steps. Each step shares the same docker network
 
 From 'DSpace/DSpace' clone (build first as needed):
 ```
-docker compose -p d8 up -d
+docker compose -p c24 up -d
 ```
 
 NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
 
 From 'DSpace/dspace-angular' clone (build first as needed)
 ```
-docker compose -p d8 -f docker/docker-compose.yml up -d
+docker compose -p c24 -f docker/docker-compose.yml up -d
 ```
 
 At this point, you should be able to access the UI from http://localhost:4000,
 and the backend at http://localhost:8080/server/
 
-## Run DSpace Angular dist build with DSpace Demo site backend
+## Run DSpace-CRIS Angular dist build with DSpace-CRIS Demo site backend
 
 This allows you to run the Angular UI in *production* mode, pointing it at the demo or sandbox backend
 (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
 
 ```
 docker compose -f docker/docker-compose-dist.yml pull
 docker compose -f docker/docker-compose-dist.yml build
-docker compose -p d8 -f docker/docker-compose-dist.yml up -d
+docker compose -p c24 -f docker/docker-compose-dist.yml up -d
 ```
 
 ## Ingest test data from AIPDIR
 
 Create an administrator
 ```
-docker compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+docker compose -p c24 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
 ```
 
 Load content from AIP files
 ```
-docker compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
+docker compose -p c24 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
 ```
 
 ## Alternative Ingest - Use Entities dataset
 _Delete your docker volumes or use a unique project (-p) name_
 
-Start DSpace with Database Content from a database dump
+Start DSpace-CRIS with Database Content from a database dump
 ```
-docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+docker compose -p c24 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
 ```
 
 Load assetstore content and trigger a re-index of the repository
 ```
-docker compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+docker compose -p c24 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
 ```
 
 ## End to end testing of the REST API (runs in GitHub Actions CI).
 _In this instance, only the REST api runs in Docker using the Entities dataset. GitHub Actions will perform CI testing of Angular using Node to drive the tests.  See `.github/workflows/build.yml` for more details._
 
 This command is only really useful for testing our Continuous Integration process.
 ```
-docker compose -p d8ci -f docker/docker-compose-ci.yml up -d
+docker compose -p c24ci -f docker/docker-compose-ci.yml up -d
 ```

docker/cli.yml

@@ -21,7 +21,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-cli:${DSPACE_VER:-2024_02_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.

docker/db.entities.yml

@@ -14,12 +14,12 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-postgres-pgcrypto:${DSPACE_VER:-2024_02_x}-loadsql"
     environment:
-      # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
-      # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      # 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
       # NOTE: currently there is no dspace8 version
-      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
+      - LOADSQL=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
     # Ensure that the database is ready BEFORE starting tomcat
@@ -35,4 +35,4 @@ services:
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored
-        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
+        java -XX:+UseParallelGC -XX:MaxRAMPercentage=75 org.springframework.boot.loader.launch.JarLauncher

docker/docker-compose-ci.yml

@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris:${DSPACE_VER:-2024_02_x}-test"
     depends_on:
     - dspacedb
     networks:
@@ -53,20 +53,21 @@ services:
     - /bin/bash
     - '-c'
     - |
-      while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
+      /dspace/bin/dspace database repair
+      /dspace/bin/dspace database migrate
       /dspace/bin/dspace database migrate ignored
-      java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
+      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:
     container_name: dspacedb
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-postgres-pgcrypto:${DSPACE_VER:-2024_02_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # 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/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
+      LOADSQL: https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
     networks:
@@ -82,7 +83,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-2024_02_x}"
     networks:
       - dspacenet
     ports:
@@ -112,6 +113,10 @@ services:
       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:

docker/docker-compose-dist.yml

@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-angular:${DSPACE_VER:-2024_02_x}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist