Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading