From 1a995094b14cd8e29f191918767e01901149334a Mon Sep 17 00:00:00 2001 From: Pavol Stefanec Date: Thu, 9 Oct 2025 14:20:16 +0200 Subject: [PATCH 1/2] both dockerfiles are now pushed to docker hub, the smaller will replace dataquest/dspace-angular and the full image will go into dataquest/dspace-angular-dev --- .github/workflows/docker.yml | 12 ++++++------ Dockerfile.dist | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4166c307a56..50a70a04378 100644 --- a/.github/workflows/docker.yml +++ b/.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 + build_id: dspace-angular image_name: dspace/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: diff --git a/Dockerfile.dist b/Dockerfile.dist index 26c8bf6d6ab..4c1fc659f4d 100644 --- a/Dockerfile.dist +++ b/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 From a0d0df07997c99d39984db412919ce480fcb4cf2 Mon Sep 17 00:00:00 2001 From: pStefanec <44786481+pStefanec@users.noreply.github.com> Date: Wed, 15 Oct 2025 10:49:44 +0200 Subject: [PATCH 2/2] Update .github/workflows/docker.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 50a70a04378..711cd674450 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,7 +50,7 @@ jobs: uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev with: build_id: dspace-angular - image_name: dspace/dspace-angular + image_name: dataquest/dspace-angular dockerfile_path: ./Dockerfile.dist run_python_version_script: true python_version_script_dest: src/static-files/VERSION_D.html