Skip to content

Commit 38bc203

Browse files
fix: update assetstore and database SQL URLs for DSpace-CRIS 2025.02.00
ref: DSC-2745
1 parent 318e5f5 commit 38bc203

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ COPY --from=build --chown=dspace /install/server-boot/application/ /app/server-b
5353
COPY --chown=dspace dspace/config/ $DSPACE_INSTALL/config/
5454
COPY --chown=dspace dspace/bin/ $DSPACE_INSTALL/bin/
5555
RUN install -d -m 0755 -o dspace -g dspace $DSPACE_INSTALL/assetstore/ $DSPACE_INSTALL/upload/ \
56-
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ \
56+
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ $DSPACE_INSTALL/var/ \
5757
&& ln -s /app/server-boot/BOOT-INF/lib $DSPACE_INSTALL/lib \
5858
&& chown -h dspace:dspace $DSPACE_INSTALL/lib \
5959
&& chmod +x $DSPACE_INSTALL/bin/*

Dockerfile.cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ COPY --from=build --chown=dspace /install/server-boot/application/ /app/server-b
5757
COPY --chown=dspace dspace/config/ $DSPACE_INSTALL/config/
5858
COPY --chown=dspace dspace/bin/ $DSPACE_INSTALL/bin/
5959
RUN install -d -m 0755 -o dspace -g dspace $DSPACE_INSTALL/assetstore/ $DSPACE_INSTALL/upload/ \
60-
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ \
60+
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ $DSPACE_INSTALL/var/ \
6161
&& ln -s /app/server-boot/BOOT-INF/lib $DSPACE_INSTALL/lib \
6262
&& chown -h dspace:dspace $DSPACE_INSTALL/lib \
6363
&& chmod +x $DSPACE_INSTALL/bin/*

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ COPY --from=build --chown=dspace /install/server-boot/application/ /app/server-b
5858
COPY --chown=dspace dspace/config/ $DSPACE_INSTALL/config/
5959
COPY --chown=dspace dspace/bin/ $DSPACE_INSTALL/bin/
6060
RUN install -d -m 0755 -o dspace -g dspace $DSPACE_INSTALL/assetstore/ $DSPACE_INSTALL/upload/ \
61-
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ \
61+
$DSPACE_INSTALL/handle-server/ $DSPACE_INSTALL/log/ $DSPACE_INSTALL/var/ \
6262
&& ln -s /app/server-boot/BOOT-INF/lib $DSPACE_INSTALL/lib \
6363
&& chown -h dspace:dspace $DSPACE_INSTALL/lib \
6464
&& chmod +x $DSPACE_INSTALL/bin/*

dspace/src/main/docker-compose/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ OPTIONALLY, you can build DSpace-CRIS images using a different JDK_VERSION like
7070
```
7171
docker compose -f docker-compose.yml -f docker-compose-cli.yml build --build-arg JDK_VERSION=17
7272
```
73-
Default is Java 11, but other LTS releases (e.g. 17) are also supported.
73+
Default is Java 17
7474

75-
## Run DSpace-CRIS 2024_02_x REST from your current branch
75+
## Run DSpace-CRIS 2025_02_x REST from your current branch
7676
```
7777
docker compose -p dcris25 up -d
7878
```
7979

80-
## Run DSpace-CRIS 2024_02_x REST and Angular from your branch
80+
## Run DSpace-CRIS 2025_02_x REST and Angular from your branch
8181

8282
```
8383
docker compose -p dcris25 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d
@@ -90,7 +90,7 @@ NOTE: This starts the UI in development mode. It will take a few minutes to see
9090

9191
See documentation in [DSpace User Interface Docker instructions](https://github.com/DSpace/dspace-angular/blob/main/docker/README.md#run-dspace-rest-and-dspace-angular-from-local-branches).
9292

93-
## Run DSpace-CRIS 2024_02_x REST with a IIIF Image Server from your branch
93+
## Run DSpace-CRIS 2025_02_x REST with a IIIF Image Server from your branch
9494
*Only useful for testing IIIF support in a development environment*
9595

9696
This command starts our `dspace-iiif` container alongside the REST API.
@@ -101,7 +101,7 @@ which can be used when IIIF support is enabled in DSpace-CRIS (`iiif.enabled=tru
101101
docker compose -p dcris25 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-iiif.yml up -d
102102
```
103103

104-
## Run DSpace-CRIS 2024_02_x REST and Shibboleth SP (in Apache) from your branch
104+
## Run DSpace-CRIS 2025_02_x REST and Shibboleth SP (in Apache) from your branch
105105
*Only useful for testing Shibboleth in a development environment*
106106

107107
This Shibboleth container uses https://samltest.id/ as an IdP (see `../docker/dspace-shibboleth/`).

dspace/src/main/docker-compose/cli.assetstore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
services:
1010
dspace-cli:
1111
environment:
12-
- LOADASSETS=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/assetstore.tar.gz
12+
- LOADASSETS=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/assetstore.tar.gz
1313
entrypoint:
1414
- /bin/bash
1515
- '-c'

dspace/src/main/docker-compose/db.entities.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ services:
1111
image: 4science/dspace-cris-postgres-pgcrypto:${DSPACE_VER:-2025_02_x}-loadsql
1212
environment:
1313
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
14-
LOADSQL: https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/db-entities.sql
14+
LOADSQL: https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/db-entities.sql

0 commit comments

Comments
 (0)