Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
0693222
UFAL/CLARIN-DSpace upgrade v9 (#1316)
milanmajchrak Jul 16, 2026
991bf72
ci: build & push Docker images from dtq-dev-9-base (#1379)
milanmajchrak Jul 16, 2026
124f364
CLARIN-DSpace v9/ci(deploy): deploy + vanilla import for instance 860…
milanmajchrak Jul 17, 2026
c22bfa0
Lindat9/Update pipeline in GA (#1386)
Kasinhou Jul 17, 2026
c114cd8
Added repository to url (#1387)
Kasinhou Jul 17, 2026
2214fdb
Added repository to rest url (#1388)
Kasinhou Jul 17, 2026
ac77cf5
UFAL/Configurable REST context-path for /repository namespace (#1391)
Kasinhou Jul 20, 2026
369cb76
UFAL/Sync PR template with dtq-dev (#1393)
Kasinhou Jul 20, 2026
f4505e6
CLARIN-DSpace v9/Port #1372 remainder + #1309 Solr heap knob to the v…
milanmajchrak Jul 21, 2026
d632fc5
CLARIN-DSpace v9/Guarded EPerson deletion in admin UI: self-delete di…
milanmajchrak Jul 21, 2026
ca27044
CLARIN-DSpace v9/Fix untranslated subjectFirstValue facet keys (#1399)
Kasinhou Jul 22, 2026
4d72c11
DataRep Upgrade/Restore DiscoJuice auto-popup on login page (#834) (#…
Kasinhou Jul 30, 2026
0e9772a
Clarin9/Fix "latest version" notice link ignoring the /repository bas…
milanmajchrak Aug 6, 2026
d513553
Clarin9/Redirect to login when an identifier resolves to a restricted…
milanmajchrak Aug 6, 2026
4f07be2
Clarin9/Port per-field type binding (submit.type-bind.field "A=>B") (…
milanmajchrak Aug 6, 2026
f6cf600
DSpace9/copy the assetstore during import (#1452)
Kasinhou Aug 13, 2026
1a2c6ea
Increased timeout
Aug 17, 2026
138cb8e
Merge pull request #1456 from dataquest-dev/increased-timeout
Kasinhou Aug 17, 2026
36ccc41
DSpace9/Restore "Submissions" entry in admin sidebar (#1458)
Kasinhou Aug 19, 2026
dd506ab
Clarin9/Fix menu-links and legacy-bitstream-redirect UI test regressi…
Kasinhou Aug 19, 2026
f78da0e
DSpace9/Redirect back to originating page after DiscoJuice local logi…
Kasinhou Aug 21, 2026
10a4e27
Clarin9/Save submission immediately when a type/sponsor/author field …
Kasinhou Sep 3, 2026
731311b
UFAL/ROR identifiers on CLARIN display surfaces + ROR authority i18n …
milanmajchrak Sep 8, 2026
bba71b4
UFAL/Fix lost CLARIN license in workflow-item edit: route-aware submi…
milanmajchrak Sep 8, 2026
2233470
Port #1415 to dtq-dev-9-base: Fix the causes of the REST self link co…
milanmajchrak Sep 9, 2026
6ff55c2
Port #1490 to dtq-dev-9-base: fix(self-link): say what happened when …
milanmajchrak Sep 9, 2026
5f16046
Port #1292 to dtq-dev-9-base: UFAL/Separate CLARIN license payload fr…
milanmajchrak Sep 9, 2026
c65a7ff
Port #1280 to dtq-dev-9-base: Refresh file listings on breadcrumb nav…
milanmajchrak Sep 9, 2026
8e8fb9d
CLARIN-DSpace v9/Port #1260 + #1241 (licence-contract and static-page…
milanmajchrak Sep 9, 2026
82c6caf
Port #1291 to dtq-dev-9-base: UFAL/Updated components to display `dc.…
milanmajchrak Sep 10, 2026
7624fb1
Port #1267 to dtq-dev-9-base: UFAL/stabilize form array reorder/delet…
milanmajchrak Sep 10, 2026
1e195a4
Port #1278 to dtq-dev-9-base: UFAL/Add New version button for archive…
milanmajchrak Sep 10, 2026
4d5741f
Port #1336 to dtq-dev-9-base: UFAL/fix(submission): keep dc.type drop…
milanmajchrak Sep 10, 2026
bba4d90
Port #1319 to dtq-dev-9-base: Edit bitstream returns to the correct i…
milanmajchrak Sep 10, 2026
04bf07d
Port #1411 to dtq-dev-9-base: UoE/Bitstream name in upload notificati…
milanmajchrak Sep 10, 2026
8c91f8b
Port #1269 to dtq-dev-9-base: UFAL/Add 'Add URL bitstream' feature to…
milanmajchrak Sep 10, 2026
b0c48c5
Port #1326 to dtq-dev-9-base: Add search icon to community and collec…
milanmajchrak Sep 10, 2026
c453631
CLARIN-DSpace v9/Port #1299 (license label management) to the v9 base…
milanmajchrak Sep 10, 2026
a2102c0
CLARIN-DSpace v9/Port #1300 (accessibility sweep) to the v9 base (#1509)
milanmajchrak Sep 10, 2026
0300412
Restore the FE-22 negative menu assertions in a unit test (#1511)
milanmajchrak Sep 10, 2026
8ac588e
Port #1350 to dtq-dev-9-base: UFAL/Backport #1333: admin-sidebar gutt…
milanmajchrak Sep 10, 2026
5b7b51b
Port X-02b to dtq-dev-9-base: restore the CLARIN bitstream-checksum c…
milanmajchrak Sep 10, 2026
1c99c5a
Port X-02f to dtq-dev-9-base: item-page URI DOI resolver and the side…
milanmajchrak Sep 10, 2026
311176a
Port #1221 to dtq-dev-9-base: UFAL/Resolve duplicate HTML element IDs…
milanmajchrak Sep 14, 2026
cd629c0
Port #1084 (part) to dtq-dev-9-base: accessible labels and per-compon…
milanmajchrak Sep 14, 2026
667c974
Port #1084 (part) to dtq-dev-9-base: accessible labels for the sugges…
milanmajchrak Sep 14, 2026
9e4db8b
Port #1450 to dtq-dev-9-base: robots.txt facet-trap rules (#1519)
milanmajchrak Sep 16, 2026
ac98f51
CLARIN-DSpace v9/Restore the item-page ZIP download route dropped by …
milanmajchrak Sep 16, 2026
d732ccd
Restore the EPeople last-active column and the search field label on …
milanmajchrak Sep 16, 2026
bd4f6c0
Restore the item version-history field on dtq-dev-9-base (#1522)
milanmajchrak Sep 16, 2026
e78e49d
CLARIN-DSpace v9/Move the visually-hidden search labels out of the in…
milanmajchrak Sep 17, 2026
fff9cf6
CLARIN-DSpace v9/Security: serve only a sanitized public AppConfig to…
milanmajchrak Sep 17, 2026
a35d895
Restore the item-page CLARIN specs dropped by the v9 upgrade (#1525)
milanmajchrak Sep 17, 2026
a00ace1
CLARIN-DSpace v9/Give the item share links an accessible name (#1547)
milanmajchrak Sep 22, 2026
7d36c82
CLARIN-DSpace v9/Make the file preview panel open again (#1550)
milanmajchrak Sep 22, 2026
f8cceb3
CLARIN-DSpace v9/Cover the per-row guard on the handle delete path (#…
milanmajchrak Sep 22, 2026
68c8610
CLARIN-DSpace v9/Make Space expand a community list node (#1557)
milanmajchrak Sep 22, 2026
bb67980
Make the item page accessibility gate able to fail (#1552)
milanmajchrak Sep 22, 2026
e2b9742
Restore the featured services dropdown on the item page (#1549)
milanmajchrak Sep 22, 2026
11c6571
Use test data in the share-link spec fixture (#1565)
milanmajchrak Sep 22, 2026
dc8ed83
CLARIN-DSpace v9/Make the file download control reachable from the ke…
milanmajchrak Sep 22, 2026
8dad11a
Make the licence selector button work in the submission step (#1544)
milanmajchrak Sep 22, 2026
237caa8
Stop announcing collection and show more rows as expandable (#1560)
milanmajchrak Sep 22, 2026
5454a4d
Let the Playwright gate pick which dspace-ui-tests branch to run (#1564)
milanmajchrak Sep 23, 2026
096bdef
Port unique form-control ids and complex-group error propagation to t…
milanmajchrak Sep 23, 2026
6ad30b9
CLARIN-DSpace v9/Port five small FE fixes (analytics DSO, usage-repor…
milanmajchrak Sep 23, 2026
66c48a0
Port the login, role, workflow-action and theme-wiring hunks lost to …
milanmajchrak Sep 23, 2026
684e86e
Stop the page scrolling when Space activates a control (#1556)
milanmajchrak Sep 23, 2026
c3eef7a
CLARIN-DSpace v9/Restore the Matomo per-item custom dimension on the …
milanmajchrak Sep 23, 2026
c48c947
Restore the admin process and curation form prefill on the v9 base (#…
milanmajchrak Sep 23, 2026
406dd39
Restore the CLARIN Publication item layout dropped by the v9 upgrade …
milanmajchrak Sep 23, 2026
7248c92
Restore the CLARIN licence gate for restricted files (#1528)
milanmajchrak Sep 23, 2026
8ec6768
Keep aria-expanded in step with what the community list renders (#1566)
milanmajchrak Sep 23, 2026
db62408
CLARIN-DSpace v9/Add the update-config entry back to the CLARIN admin…
milanmajchrak Sep 23, 2026
7842fa2
CLARIN-DSpace v9/Restore the CLARIN version-history table behaviour d…
milanmajchrak Sep 23, 2026
4314434
CLARIN-DSpace v9/Carry the request-a-copy token through to the CLARIN…
milanmajchrak Sep 23, 2026
194807b
CLARIN-DSpace v9/Show the Shibboleth authentication failure on the lo…
milanmajchrak Sep 23, 2026
f7b6244
CLARIN-DSpace v9/Show the submitter note on the full item page again …
milanmajchrak Sep 23, 2026
150c732
Restore the CLARIN notice confirmation gate on deposit (#1538)
milanmajchrak Sep 23, 2026
849260b
Restore the CLARIN branding on the logout page (#1526)
milanmajchrak Sep 23, 2026
e20eeef
Add the missing separator to the Czech download label (#1530)
milanmajchrak Sep 23, 2026
2d5dc40
Restore the EPIC PID administration specs dropped by the v9 upgrade (…
milanmajchrak Sep 23, 2026
efef1b3
Restore the shared, core and login-page CLARIN specs dropped by the v…
milanmajchrak Sep 23, 2026
2f87dda
CLARIN-DSpace v9/Restore CLARIN unit specs to the v9 base (#1540)
milanmajchrak Sep 23, 2026
51f22b6
Restore CLARIN cypress e2e specs on the v9 base (#1541)
milanmajchrak Sep 23, 2026
bd5a1a0
CLARIN-DSpace v9/Make the accessibility gates wait for the client ren…
milanmajchrak Sep 23, 2026
94336d1
CLARIN-DSpace v9/Make a nightly gate that produced no result end red …
milanmajchrak Sep 23, 2026
3ba48cd
Make the licence picker open and test the deposit gate for real (#1568)
milanmajchrak Sep 24, 2026
1f5675d
CLARIN-DSpace v9/Item page: readable file panel, query-form download …
milanmajchrak Sep 24, 2026
62115c7
Keep aria-expanded right after a community is collapsed (#1569)
milanmajchrak Sep 24, 2026
bea5851
CLARIN-DSpace v9/Restore the remaining CLARIN specs and e2e tests (#1…
milanmajchrak Sep 24, 2026
3218c05
Raise the Playwright job limit to two hours (#1571)
milanmajchrak Sep 24, 2026
e5b896d
CLARIN-DSpace v9/Search page asks the backend for items only (#1572)
milanmajchrak Sep 29, 2026
aae1f9e
CLARIN-DSpace v9/Licence picker works from the keyboard; hide Statist…
milanmajchrak Sep 29, 2026
50f4a80
Show the Already Logged In panel on the login page (#1577)
milanmajchrak Oct 5, 2026
d94fd9b
CLARIN-DSpace v9/Return to the item after editing a bitstream opened …
milanmajchrak Oct 5, 2026
8d4dd74
CLARIN-DSpace v9/Log flaky Cypress tests and skip four known ones (#1…
milanmajchrak Oct 5, 2026
785c6ab
CLARIN-DSpace v9/Translate the search results heading for the items c…
milanmajchrak Oct 6, 2026
80f4b5a
Give required inputs of an optional complex field a required message …
milanmajchrak Oct 6, 2026
8875cc6
Show retried e2e tests in the job summary (#1583)
milanmajchrak Oct 6, 2026
252e573
CLARIN-DSpace v9/Request-a-copy link keeps its token through the lice…
milanmajchrak Oct 6, 2026
c5c5e0f
CLARIN-DSpace v9/Port missed fork fixes: meta tags, error page link, …
milanmajchrak Oct 7, 2026
d1fc21b
Run e2e tests in Chrome for Testing (#1622)
milanmajchrak Oct 19, 2026
833805f
CLARIN-DSpace v9: redirect anonymous bitstream download on the server…
milanmajchrak Oct 22, 2026
1a78725
CI: bump cypress-io/github-action to v7.4.4 (#1656)
vidiecan Oct 23, 2026
d34b5d2
Backport(CI): bump cypress-io/github-action to v7.4.4 (#1659)
jr-rk Oct 26, 2026
f4d6bb4
CLARIN-DSpace v9: request-a-copy flag on item pages, licence page err…
milanmajchrak Oct 26, 2026
b4f55e3
cleanup
Oct 30, 2026
f095a11
cleanup
Oct 30, 2026
c713e0a
prepare for ufal ci/cd
Oct 30, 2026
32ac445
Keep the license label icon when editing without a new file (#1730)
milanmajchrak Nov 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"dspace-angular-html"
],
"ignorePatterns": [
"lint/test/fixture"
"lint/test/fixture",
"src/static-files"
],
"overrides": [
{
Expand Down
54 changes: 30 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ jobs:
CYPRESS_BASE_URL: http://127.0.0.1:4000
# Disable the cookie consent banner in e2e tests to avoid errors because of elements hidden by it
DSPACE_INFO_ENABLECOOKIECONSENTPOPUP: false
# When Chrome version is specified, we pin to a specific version of Chrome
# Comment this out to use the latest release
#CHROME_VERSION: "90.0.4430.212-1"
# Bump Node heap size (OOM in CI after upgrading to Angular 15)
NODE_OPTIONS: '--max-old-space-size=4096'
# Project name to use when running "docker compose" prior to e2e tests
Expand Down Expand Up @@ -63,22 +60,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

# If CHROME_VERSION env variable specified above, then pin to that version.
# Otherwise, just install latest version of Chrome.
- name: Install Chrome (for e2e tests)
run: |
if [[ -z "${CHROME_VERSION}" ]]
then
echo "Installing latest stable version"
sudo apt-get update
sudo apt-get --only-upgrade install google-chrome-stable -y
else
echo "Installing version ${CHROME_VERSION}"
wget -q "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
sudo dpkg -i "google-chrome-stable_${CHROME_VERSION}_amd64.deb"
fi
google-chrome --version

# https://github.com/actions/cache/blob/main/examples.md#node---npm
- name: Get NPM cache directory
id: npm-cache-dir
Expand Down Expand Up @@ -145,14 +126,23 @@ jobs:
docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
docker container ls

# Installs "Chrome for Testing" which is a version of Chrome stabilized for automated testing
# Cypress recommends using Chrome For Testing for reliable, reproducible runs
# https://docs.cypress.io/app/references/launching-browsers
- name: Install Chrome For Testing (for e2e tests)
uses: browser-actions/setup-chrome@v2
# To pin to a specific version of Chrome, uncomment this parameter
#with:
# chrome-version: 154

# Run integration tests via Cypress.io
# https://github.com/cypress-io/github-action
# (NOTE: to run these e2e tests locally, just use 'ng e2e')
- name: Run e2e tests (integration tests)
uses: cypress-io/github-action@v7.1.9
uses: cypress-io/github-action@v7.4.4
with:
# Run tests in Chrome, headless mode (default)
browser: chrome
# Run tests in Chrome for Testing
browser: chrome-for-testing
# Start app before running tests (will be stopped automatically after tests finish)
start: npm run serve:ssr
# Wait for backend & frontend to be available
Expand Down Expand Up @@ -198,14 +188,15 @@ jobs:
done
echo "App started successfully."

# Get homepage and verify that the <meta name="title"> tag includes "DSpace".
# Get homepage and verify that the <meta name="title"> tag includes the repository title
# ("LINDAT/CLARIAH-CZ Repository" on this CLARIN branch, "DSpace" on vanilla).
# If it does, then SSR is working, as this tag is created by our MetadataService.
# This step also prints entire HTML of homepage for easier debugging if grep fails.
- name: Verify SSR (server-side rendering) on Homepage
run: |
result=$(wget -O- -q http://127.0.0.1:4000/home)
echo "$result"
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep -E "LINDAT|DSpace"

# Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
# If it does, then SSR is working.
Expand Down Expand Up @@ -313,6 +304,21 @@ jobs:
- name: Stop running app
run: kill -9 $(lsof -t -i:4000)

# If any prior step errors out, export the backend logs for help with debugging issues
- name: Export backend logs (on failure only)
if: failure()
run: |
docker compose -f ./docker/docker-compose-ci.yml logs > backend-logs-${{ matrix.node-version }}.txt

# If any prior step errors out, upload backend logs to artifact
- name: Upload backend logs to artifact (on failure only)
uses: actions/upload-artifact@v7
if: failure()
with:
name: backend-logs-${{ matrix.node-version }}
path: backend-logs-${{ matrix.node-version }}.txt
retention-days: 14

- name: Shutdown Docker containers
run: docker compose -f ./docker/docker-compose-ci.yml down

Expand Down
175 changes: 27 additions & 148 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,179 +1,58 @@
# DSpace Docker image build for hub.docker.com
name: Docker images

# Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
# Also run for PRs to ensure PR doesn't break Docker build process
# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml
#
# Run this Build for all pushes to 'clarin-v9'.
# Also run for PRs to ensure PR doesn't break Docker build process (PRs build, but do not push).
# NOTE: uses "reusable-docker-build.yml" in ufal/clarin-dspace to actually build each of the Docker images
# https://github.com/ufal/clarin-dspace/blob/clarin-v9/.github/workflows/reusable-docker-build.yml
on:
push:
branches:
- main
- 'dspace-**'
tags:
- 'dspace-**'
- clarin-v9
pull_request:
workflow_dispatch:

permissions:
contents: read # to fetch code (actions/checkout)
packages: write # to write images to GitHub Container Registry (GHCR)

jobs:
#############################################################
# Build/Push the 'dspace/dspace-angular' image
# Build/Push the 'ufal/dspace-angular' image ('-dev' tag)
#############################################################
dspace-angular:
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
if: github.repository == 'dspace/dspace-angular'
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
# Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace-angular'
if: github.repository == 'ufal/dspace-angular'
# Use the reusable-docker-build.yml script from ufal/clarin-dspace repo to build our Docker image
uses: ufal/clarin-dspace/.github/workflows/reusable-docker-build.yml@clarin-v9
with:
build_id: dspace-angular-dev
image_name: dspace/dspace-angular
image_name: ufal/dspace-angular
dockerfile_path: ./Dockerfile
# As this is a development image, its tags are all suffixed with "-dev". Otherwise, it uses the same
# tagging logic as the primary 'ufal/dspace-angular' image below.
tags_flavor: suffix=-dev
run_python_version_script: true
python_version_script_dest: src/static-files/VERSION_D.html
secrets:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}

#############################################################
# Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
# Build/Push the 'ufal/dspace-angular' image.
# This is the production ("dist") build, published under the plain (un-suffixed) tag.
#############################################################
dspace-angular-dist:
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
if: github.repository == 'dspace/dspace-angular'
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
# Ensure this job never runs on forked repos. It's only executed for 'ufal/dspace-angular'
if: github.repository == 'ufal/dspace-angular'
# Use the reusable-docker-build.yml script from ufal/clarin-dspace repo to build our Docker image
uses: ufal/clarin-dspace/.github/workflows/reusable-docker-build.yml@clarin-v9
with:
build_id: dspace-angular-dist
image_name: dspace/dspace-angular
build_id: dspace-angular
image_name: ufal/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:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
# Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
# these sites as specified in reusable-docker-build.xml
REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }}
REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }}

#################################################################################
# Test Deployment via Docker to ensure newly built images are working properly
#################################################################################
docker-deploy:
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
if: github.repository == 'dspace/dspace-angular'
runs-on: ubuntu-latest
# Must run after all major images are built
needs: [dspace-angular, dspace-angular-dist]
env:
# Override default dspace.server.url & REST 'host' because backend starts at http://127.0.0.1:8080
dspace__P__server__P__url: http://127.0.0.1:8080/server
DSPACE_REST_HOST: 127.0.0.1
# Override default dspace.ui.url to also use 127.0.0.1.
dspace__P__ui__P__url: http://127.0.0.1:4000
# Override default ui.baseUrl to also use 127.0.0.1. This must match 'dspace.ui.url' for SSR to be enabled.
DSPACE_UI_BASEURL: http://127.0.0.1:4000
steps:
# Checkout our codebase (to get access to Docker Compose scripts)
- name: Checkout codebase
uses: actions/checkout@v6
# Download Docker image artifacts (which were just built by reusable-docker-build.yml)
- name: Download Docker image artifacts
uses: actions/download-artifact@v8
with:
# Download all amd64 Docker images (TAR files) into the /tmp/docker directory
pattern: docker-image-*-linux-amd64
path: /tmp/docker
merge-multiple: true
# Load each of the images into Docker by calling "docker image load" for each.
# This ensures we are using the images just built & not any prior versions on DockerHub
- name: Load all downloaded Docker images
run: |
find /tmp/docker -type f -name "*.tar" -exec docker image load --input "{}" \;
docker image ls -a
# Start backend using our compose script in the codebase.
- name: Start backend in Docker
# MUST use docker.io as we don't have a copy of this backend image in our GitHub Action,
# and docker.io is the only public image. If we ever hit aggressive rate limits at DockerHub,
# we may need to consider making the 'ghcr.io' images public & switch this to 'ghcr.io'
env:
DOCKER_REGISTRY: docker.io
run: |
docker compose -f docker/docker-compose-rest.yml up -d
sleep 10
docker container ls
# Create a test admin account. Load test data from a simple set of AIPs as defined in cli.ingest.yml
# NOTE: Before creating test data, we wait for the backend to become responsive by requesting it every 10 sec.
# Timeout after 5 minutes. This is done to ensure the backend is fully initialized before we create test data.
- name: Load test data into Backend
run: |
timeout 5m wget --retry-connrefused -t 0 --waitretry=10 http://127.0.0.1:8080/server/api
docker compose -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
docker compose -f docker/cli.yml -f docker/cli.ingest.yml run --rm dspace-cli
# Verify backend started successfully.
# 1. Make sure root endpoint is responding (check for dspace.name defined in docker-compose.yml)
# 2. Also check /collections endpoint to ensure the test data loaded properly (check for a collection name in AIPs)
- name: Verify backend is responding properly
run: |
result=$(wget -O- -q http://127.0.0.1:8080/server/api)
echo "$result"
echo "$result" | grep -oE "\"DSpace Started with Docker Compose\""
result=$(wget -O- -q http://127.0.0.1:8080/server/api/core/collections)
echo "$result"
echo "$result" | grep -oE "\"Dog in Yard\""
# Start production frontend using our compose script in the codebase.
- name: Start production frontend in Docker
# Specify the GHCR copy of the production frontend, so that we use the newly built image
env:
DOCKER_REGISTRY: ghcr.io
run: |
docker compose -f docker/docker-compose-dist.yml up -d
sleep 10
docker container ls
# Verify production frontend started successfully.
# 1. Make sure /home path has "DSpace software" (this is in the footer of the page)
# 2. Also check /community-list page lists one of the test Communities in the loaded test data
- name: Verify production frontend is responding properly
run: |
result=$(wget -O- -q http://127.0.0.1:4000/home)
echo "$result"
echo "$result" | grep -oE "\"DSpace software\""
- name: Error logs of production frontend (if error in startup)
if: ${{ failure() }}
run: |
docker compose -f docker/docker-compose-dist.yml logs
# Now shutdown the production frontend image and startup the development frontend image
- name: Shutdown production frontend
run: |
docker compose -f docker/docker-compose-dist.yml down
sleep 10
docker container ls
- name: Startup development frontend
# Specify the GHCR copy of the development frontend, so that we use the newly built image
env:
DOCKER_REGISTRY: ghcr.io
run: |
docker compose -f docker/docker-compose.yml up -d
sleep 10
docker container ls
# Verify development frontend started successfully.
# 1. First, keep requesting the frontend every 10 seconds to wait until its up. Timeout after 10 minutes.
# 2. Once it's responding, check to see if the word "DSpace" appears.
# We cannot check for anything more specific because development mode doesn't have SSR.
- name: Verify development frontend is responding properly
run: |
timeout 10m wget --retry-connrefused -t 0 --waitretry=10 http://127.0.0.1:4000
result=$(wget -O- -q http://127.0.0.1:4000)
echo "$result"
echo "$result" | grep -oE "DSpace"
- name: Error logs of development frontend (if error in startup)
if: ${{ failure() }}
run: |
docker compose -f docker/docker-compose.yml logs
# Shutdown our containers
- name: Shutdown running Docker containers
run: |
docker compose -f docker/docker-compose.yml -f docker/docker-compose-rest.yml down
28 changes: 28 additions & 0 deletions .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Release

on:
push:
tags:
- '**'

env:
IMAGE_BASE_NAME: ufal/dspace-angular

jobs:
retag-FE-image:
runs-on: ubuntu-latest
steps:
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}

- name: retag image
run: |
docker pull ${{ env.IMAGE_BASE_NAME }}:${{ github.sha }}
docker tag ${{ env.IMAGE_BASE_NAME }}:${{ github.sha }} ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}

- name: push image
run: docker push ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}

17 changes: 14 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,17 @@
"aot": true,
"assets": [
"src/assets",
"src/robots.txt"
"src/static-files",
"src/robots.txt",
{
"glob": "**/*",
"input": "src/aai",
"output": "/aai"
}
],
"styles": [
"src/styles/startup.scss",
"src/aai/discojuice/discojuice.css",
{
"input": "src/styles/base-theme.scss",
"inject": false,
Expand All @@ -63,7 +70,10 @@
"node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css",
"node_modules/leaflet.markercluster/dist/MarkerCluster.css"
],
"scripts": [],
"scripts": [
"src/license-selector.js",
"src/license-selector-creation.js"
],
"baseHref": "/"
},
"configurations": {
Expand Down Expand Up @@ -149,7 +159,8 @@
"vendor": false
},
"assets": [
"src/assets"
"src/assets",
"src/static-files"
],
"styles": [
{
Expand Down
Loading
Loading