Customer/palo docker rebase

.github/workflows/docker.yml

@@ -28,9 +28,12 @@ jobs:
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
       image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile
+      tags_flavor: suffix=-dev
+      # As this is a "dev" image, its tags are all suffixed with "-dev". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:
@@ -42,16 +45,13 @@ jobs:
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular'
-    if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now
+    if: github.repository == 'dataquest-dev/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular-dist
-      image_name: dspace/dspace-angular
+      build_id: dspace-angular
+      image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile.dist
-      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-      # tagging logic as the primary 'dspace/dspace-angular' image above.
-      tags_flavor: suffix=-dist
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:
@@ -69,4 +69,4 @@ jobs:
     with:
       INSTANCE: '5'
       IMPORT: false
-    secrets: inherit
+    secrets: inherit

.github/workflows/trigger-ui-tests.yml

@@ -24,7 +24,7 @@ jobs:
 
           git fetch --prune origin
           BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
-          SKIP_BRANCHES=("customer/sav")
+          SKIP_BRANCHES=("customer/sav" "customer/uk")
 
           for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
             if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then

Dockerfile.dist

@@ -15,6 +15,9 @@ COPY package.json yarn.lock ./
 RUN yarn install --network-timeout 300000
 
 ADD . /app/
+
+# Set memory limit for build process - Angular builds require more memory
+ENV NODE_OPTIONS="--max_old_space_size=4096"
 RUN yarn build:prod
 
 FROM node:18-alpine
@@ -24,6 +27,14 @@ 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
 
+# user node does not have root priviliges sop we need to ensure that 
+# necessary files exist and node has sufficient access rights
+RUN mkdir -p /app/dist/browser/assets \
+ && touch /app/dist/browser/assets/config.json \
+ && chown -R node:node /app/dist/browser/assets \
+ && chmod -R 755 /app/dist/browser/assets \
+ && chmod 664 /app/dist/browser/assets/config.json
+
 WORKDIR /app
 USER node
 ENV NODE_ENV=production

docker/docker-compose.yml

@@ -36,7 +36,7 @@ services:
       dockerfile: Dockerfile
     networks:
       dspacenet:
-    entrypoint: ${FE_CMD:-/bin/sh -c "pm2-runtime start docker/dspace-ui.json > /dev/null 2> /dev/null"}
+    entrypoint: ${FE_CMD:-/bin/sh -c "pm2-runtime start dspace-ui.json > /dev/null 2> /dev/null"}
     ports:
     - published: 400${INSTANCE}
       target: 4000

src/app/core/metadata/metadata.service.ts

@@ -128,8 +128,8 @@ export class MetadataService {
       const titlePrefix = this.translate.get('repository.title.prefix');
       const title = this.translate.get(routeInfo.data.value.title, routeInfo.data.value);
       combineLatest([titlePrefix, title]).pipe(take(1)).subscribe(([translatedTitlePrefix, translatedTitle]: [string, string]) => {
-        this.addMetaTag('title', translatedTitlePrefix + translatedTitle);
-        this.title.setTitle(translatedTitlePrefix + translatedTitle);
+        this.addMetaTag('title', translatedTitlePrefix + ' ' + translatedTitle);
+        this.title.setTitle(translatedTitlePrefix + ' ' + translatedTitle);
       });
     }
     if (routeInfo.data.value.description) {