Skip to content

Commit 6600f20

Browse files
committed
[DSC-2193] Update version references
1 parent c033a68 commit 6600f20

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

bitbucket-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ definitions:
1818
- git config --global user.name "${BB_EMAIL}"
1919
- git clone https://x-token-auth:${E2ERUNNERS_ACCESS_TOKEN}@${E2E_VALUES_REPO}
2020
- cd e2erunners-values
21-
- sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2024 > ${HASH_COMMIT}
22-
- sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2024 ${HASH_COMMIT}
21+
- sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2025 > ${HASH_COMMIT}
22+
- sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2025 ${HASH_COMMIT}
2323
- git add ${HASH_COMMIT}
2424
- git commit -m "Add configuration for e2e-${HASH_COMMIT}" || echo "No changes to commit"
2525
- git push
@@ -44,8 +44,8 @@ definitions:
4444
- git config --global user.name "${BB_EMAIL}"
4545
- git clone https://x-token-auth:${E2ERUNNERS_ACCESS_TOKEN}@${E2E_VALUES_REPO}
4646
- cd e2erunners-values
47-
- sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2024 > ${HASH_COMMIT}
48-
- sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2024 ${HASH_COMMIT}
47+
- sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2025 > ${HASH_COMMIT}
48+
- sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2025 ${HASH_COMMIT}
4949
- git add ${HASH_COMMIT}
5050
- git commit -m "Add configuration for e2e-${HASH_COMMIT}" || echo "No changes to commit"
5151
- git push

docker/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ docker compose -f docker/docker-compose.yml build
7171

7272
This command provides a quick way to start both the frontend & backend from this single codebase
7373
```
74-
docker compose -p dcris24 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
74+
docker compose -p dcris25 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
7575
```
7676

7777
Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
@@ -86,14 +86,14 @@ _The system will be started in 2 steps. Each step shares the same docker network
8686

8787
From 'DSpace/DSpace' clone (build first as needed):
8888
```
89-
docker compose -p dcris24 up -d
89+
docker compose -p dcris25 up -d
9090
```
9191

9292
NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
9393

9494
From 'DSpace/dspace-angular' clone (build first as needed)
9595
```
96-
docker compose -p dcris24 -f docker/docker-compose.yml up -d
96+
docker compose -p dcris25 -f docker/docker-compose.yml up -d
9797
```
9898

9999
At this point, you should be able to access the UI from http://localhost:4000,
@@ -107,38 +107,38 @@ This allows you to run the Angular UI in *production* mode, pointing it at the d
107107
```
108108
docker compose -f docker/docker-compose-dist.yml pull
109109
docker compose -f docker/docker-compose-dist.yml build
110-
docker compose -p dcris24 -f docker/docker-compose-dist.yml up -d
110+
docker compose -p dcris25 -f docker/docker-compose-dist.yml up -d
111111
```
112112

113113
## Ingest test data from AIPDIR
114114

115115
Create an administrator
116116
```
117-
docker compose -p dcris24 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
117+
docker compose -p dcris25 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
118118
```
119119

120120
Load content from AIP files
121121
```
122-
docker compose -p dcris24 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
122+
docker compose -p dcris25 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
123123
```
124124

125125
## Alternative Ingest - Use Entities dataset
126126
_Delete your docker volumes or use a unique project (-p) name_
127127

128128
Start DSpace-CRIS with Database Content from a database dump
129129
```
130-
docker compose -p dcris24 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
130+
docker compose -p dcris25 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
131131
```
132132

133133
Load assetstore content and trigger a re-index of the repository
134134
```
135-
docker compose -p dcris24 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
135+
docker compose -p dcris25 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
136136
```
137137

138138
## End to end testing of the REST API (runs in GitHub Actions CI).
139139
_In this instance, only the REST api runs in Docker using the Entities dataset. GitHub Actions will perform CI testing of Angular using Node to drive the tests. See `.github/workflows/build.yml` for more details._
140140

141141
This command is only really useful for testing our Continuous Integration process.
142142
```
143-
docker compose -p dcris24ci -f docker/docker-compose-ci.yml up -d
143+
docker compose -p dcris25ci -f docker/docker-compose-ci.yml up -d
144144
```

docker/cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Therefore, it should be kept in sync with that file
1515
networks:
1616
# Default to using network named 'dspacenet' from docker-compose-rest.yml.
17-
# Its full name will be prepended with the project name (e.g. "-p dcris24" means it will be named "dcris24_dspacenet")
17+
# Its full name will be prepended with the project name (e.g. "-p dcris25" means it will be named "dcris25_dspacenet")
1818
# If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
1919
default:
2020
name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet

docker/docker-compose-rest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ services:
101101
# * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
102102
# * Second, copy configsets to this core:
103103
# Updates to Solr configs require the container to be rebuilt/restarted:
104-
# `docker compose -p dcris24 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
104+
# `docker compose -p dcris25 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
105105
entrypoint:
106106
- /bin/bash
107107
- '-c'

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# for example via 'docker-compose-rest.yml'
1212
networks:
1313
# Default to using network named 'dspacenet' from docker-compose.yml.
14-
# Its full name will be prepended with the project name (e.g. "-p dcris24" means it will be named "dcris24_dspacenet")
14+
# Its full name will be prepended with the project name (e.g. "-p dcris25" means it will be named "dcris25_dspacenet")
1515
default:
1616
name: ${COMPOSE_PROJECT_NAME}_dspacenet
1717
external: true

0 commit comments

Comments
 (0)