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
3 changes: 0 additions & 3 deletions docker-compose-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ services:
# Mount local [src]/dspace/config/ to container. This syncs your local configs with container
# NOTE: Environment variables specified above will OVERRIDE any configs in local.cfg or dspace.cfg
- ./dspace/config:/dspace/config
# UMD Customization
- ./dspace/src/main/docker-compose/local.cfg:/dspace/config/local.cfg
# End UMD Customization
entrypoint: /dspace/bin/dspace
command: help
tty: true
Expand Down
10 changes: 5 additions & 5 deletions dspace/docs/DockerDevelopmentEnvironment.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,13 @@ To start debugging,

```zsh
# To stop all the containers
$ docker compose -p d7 stop
$ docker compose -p d8 stop

# To stop just the dspace container
$ docker compose -p d7 stop dspace
$ docker compose -p d8 stop dspace

# To restart just the dspace container
$ docker compose -p d7 restart dspace
$ docker compose -p d8 restart dspace

# To attach to the dspace container
$ docker exec -it dspace bash
Expand All @@ -207,9 +207,9 @@ $ docker exec -it dspace bash
## Create an administrator user

```zsh
$ docker compose -p d7 -f docker-compose-cli.yml run dspace-cli create-administrator
$ docker compose -p d8 -f docker-compose-cli.yml run dspace-cli create-administrator
$ docker exec -it dspace /dspace/bin/dspace create-administrator
Creating d7_dspace-cli_run ... done
Creating d8_dspace-cli_run ... done
Creating an initial administrator account
E-mail address: <EMAIL_ADDRESS>
First name: <FIRST_NAME>
Expand Down
4 changes: 2 additions & 2 deletions dspace/docs/DrumDBRestore.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DRUM Database Restore

**Note:** The following steps describe retrieving a DRUM DSpace database
snapshot from Kubernetes with use with DRUM for local development.
snapshot from Kubernetes for use with DRUM for local development.

1) Switch the appropriate Kubernetes namespace from which the database snapshot
should be retrieved (the following example uses the Kubernetes "test"
Expand All @@ -28,7 +28,7 @@ snapshot from Kubernetes with use with DRUM for local development.
Start the "dspacedb" container and wait for the restore to complete.

```bash
$ docker compose -p d7 up -d dspacedb
$ docker compose -p d8 up -d dspacedb
```

To determine if the restore is complete, run the following command, and wait
Expand Down
20 changes: 0 additions & 20 deletions dspace/src/main/docker-compose/local.cfg

This file was deleted.

4 changes: 2 additions & 2 deletions postgres-init/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ database is not previously initialized. If you would like to reinitialize the
database, stop the dspacedb container and delete the volume.

```zsh
$ docker-compose -p d7 down
$ docker volume rm d7_pgdata
$ docker-compose -p d8 down
$ docker volume rm d8_pgdata
```

---
Expand Down
2 changes: 1 addition & 1 deletion postgres-init/pg_restore.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

# Retreive the directory where the script resides
# Retrieve the directory where the script resides
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

# Switch to the script directory
Expand Down