Commit 325b029
committed
WIP rebase onto upstream/clarin-v7: move customizations out of upstream files
Parks rebased work on a branch. Login is broken and needs investigation —
do not merge to clarin-dk-v7 until root-caused.
Restructured to keep upstream-tracked files (Dockerfile, docker-compose.yml)
byte-identical with upstream/clarin-v7. All CLARIN-DK deltas now live in
files we own:
- docker/docker-compose.frontend.override.yml (new) — frontend compose deltas:
* build with Dockerfile.dist (matches upstream's intended build path; the
pm2 config lands at /app/dspace-ui.json, where upstream's compose
entrypoint looks after ufal/dspace-angular#1060)
* mem_limit: 2g (SSR leak cap; previously in docker-compose.yml)
* DSPACE_UI_HOST=0.0.0.0 (upstream hard-codes the docker-network hostname,
which doesn't fit our nginx-on-host reverse-proxy layout)
* DSPACE_REST_PORT=443 (upstream defaults to :8080 which only works inside
the docker network; we reach the backend via nginx at HTTPS :443)
- Dockerfile: restored to upstream (dropped our yarn-install caching split;
no longer used since we build with Dockerfile.dist)
- docker/docker-compose.yml: restored to upstream (mem_limit and env
defaults moved to the frontend override file)
Frontend compose invocation now requires the extra -f flag:
docker compose -f docker-compose.yml -f docker-compose.frontend.override.yml up -d --build
README still documents the old single-file invocation — update before merging.
Known broken: login flow after this rebase. Backend unchanged, so the cause
is likely in the upstream frontend commits (137 of them) or in an interaction
with our Shibboleth/DiscoJuice customizations under src/aai/.1 parent 52b06f5 commit 325b029
3 files changed
Lines changed: 24 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | | - | |
13 | | - | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | 18 | | |
22 | 19 | | |
23 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 18 | | |
25 | 19 | | |
26 | | - | |
27 | 20 | | |
28 | | - | |
| 21 | + | |
29 | 22 | | |
30 | 23 | | |
31 | 24 | | |
32 | | - | |
33 | 25 | | |
34 | 26 | | |
35 | | - | |
| 27 | + | |
36 | 28 | | |
37 | 29 | | |
38 | 30 | | |
| |||
0 commit comments