diff --git a/docker-compose-cli.yml b/docker-compose-cli.yml index 8fee7996c4a2..942354f4d5c8 100644 --- a/docker-compose-cli.yml +++ b/docker-compose-cli.yml @@ -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 diff --git a/dspace/docs/DockerDevelopmentEnvironment.md b/dspace/docs/DockerDevelopmentEnvironment.md index 7e2970699556..6a3a280c237c 100644 --- a/dspace/docs/DockerDevelopmentEnvironment.md +++ b/dspace/docs/DockerDevelopmentEnvironment.md @@ -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 @@ -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: First name: diff --git a/dspace/docs/DrumDBRestore.md b/dspace/docs/DrumDBRestore.md index 4e2eede41d79..249d15bb8fef 100644 --- a/dspace/docs/DrumDBRestore.md +++ b/dspace/docs/DrumDBRestore.md @@ -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" @@ -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 diff --git a/dspace/src/main/docker-compose/local.cfg b/dspace/src/main/docker-compose/local.cfg deleted file mode 100644 index 207ad9a28dc3..000000000000 --- a/dspace/src/main/docker-compose/local.cfg +++ /dev/null @@ -1,20 +0,0 @@ -dspace.dir=/dspace -db.url=jdbc:postgresql://dspacedb:5432/drum -db.username = drum -db.password = drum -dspace.hostname=localhost -dspace.baseUrl=http://localhost:8080 -dspace.name=DSpace Started with Docker Compose -solr.server=http://solr:8983/solr - -######################## -##### EZID CONFIG ###### -######################### - -identifier.doi.user = -identifier.doi.password = -identifier.doi.prefix = -identifier.doi.datacite.host = mds.test.datacite.org -identifier.doi.mintRandom = true -identifier.doi.namespaceseparator = m2 -crosswalk.dissemination.DataCite.publisher = Maryland Shared Open Access Repository \ No newline at end of file diff --git a/postgres-init/README.md b/postgres-init/README.md index c098f149023f..1e09ec6e57c8 100644 --- a/postgres-init/README.md +++ b/postgres-init/README.md @@ -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 ``` --- diff --git a/postgres-init/pg_restore.sh b/postgres-init/pg_restore.sh index 2f023b7941d7..5658125f5eb3 100755 --- a/postgres-init/pg_restore.sh +++ b/postgres-init/pg_restore.sh @@ -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