From ed5ad6b19e088ecb61333e196b90ec7986ea1da8 Mon Sep 17 00:00:00 2001 From: Matus Kasak Date: Thu, 18 Sep 2025 11:49:47 +0200 Subject: [PATCH] Replacing admin and user --- build-scripts/import/harvest.bat | 6 +++--- build-scripts/import/harvest.sh | 6 +++--- build-scripts/run/start.bat | 2 +- build-scripts/run/start.sh | 4 ++-- docker/README.md | 2 +- docker/cli.ingest.yml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-scripts/import/harvest.bat b/build-scripts/import/harvest.bat index 39a14b3dd90..647de14f4f7 100644 --- a/build-scripts/import/harvest.bat +++ b/build-scripts/import/harvest.bat @@ -3,11 +3,11 @@ IF "%ENVFILE%"=="" set ENVFILE=%cd%/envs/.default :: wiki: https://wiki.lyrasis.org/display/DSDOC7x/OAI#OAI-HarvestingfromanotherDSpace pushd ..\.. :: import community with collection -docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml -v build-scripts/import/assets:/assets run --rm dspace-cli structure-builder -f /assets/test_community_collection.xml -o /assets/test_import_output.xml -e test@test.edu +docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml -v build-scripts/import/assets:/assets run --rm dspace-cli structure-builder -f /assets/test_community_collection.xml -o /assets/test_import_output.xml -e dspace.admin.dev@dataquest.sk :: test connection docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -g -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 :: set up collection for harvesting -docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -s -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e test@test.edu +docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -s -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e dspace.admin.dev@dataquest.sk :: start harvesting -docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -r -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e test@test.edu +docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -r -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e dspace.admin.dev@dataquest.sk popd diff --git a/build-scripts/import/harvest.sh b/build-scripts/import/harvest.sh index 404abe33b9c..15f308907a5 100644 --- a/build-scripts/import/harvest.sh +++ b/build-scripts/import/harvest.sh @@ -9,11 +9,11 @@ source $ENVFILE # wiki: https://wiki.lyrasis.org/display/DSDOC7x/OAI#OAI-HarvestingfromanotherDSpace pushd ../.. # import community with collection -docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml -v $(pwd)/build-scripts/import/assets:/assets run --rm dspace-cli structure-builder -f /assets/test_community_collection.xml -o /assets/test_import_output.xml -e test@test.edu +docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml -v $(pwd)/build-scripts/import/assets:/assets run --rm dspace-cli structure-builder -f /assets/test_community_collection.xml -o /assets/test_import_output.xml -e dspace.admin.dev@dataquest.sk # test connection docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -g -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 # set up collection for harvesting -docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -s -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e test@test.edu +docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -s -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e dspace.admin.dev@dataquest.sk # start harvesting -docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -r -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e test@test.edu +docker-compose --env-file $ENVFILE -p dq-d7 -f docker/cli.yml run --rm dspace-cli harvest -r -c 123456789/2 -a http://lindat.mff.cuni.cz/repository/oai/request -i hdl_11234_3430 -m dc -t 1 -e dspace.admin.dev@dataquest.sk popd diff --git a/build-scripts/run/start.bat b/build-scripts/run/start.bat index 3b88b3f6ae5..d1c0102fe3d 100644 --- a/build-scripts/run/start.bat +++ b/build-scripts/run/start.bat @@ -10,7 +10,7 @@ call start.backend.bat nopause call start.frontend.bat nopause pushd ..\.. -docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en +docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e dspace.admin.dev@dataquest.sk -f admin -l user -p admin -c en docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/cli.yml run --rm dspace-cli version popd diff --git a/build-scripts/run/start.sh b/build-scripts/run/start.sh index 82b4be69e34..0bc5d6b566f 100755 --- a/build-scripts/run/start.sh +++ b/build-scripts/run/start.sh @@ -28,8 +28,8 @@ echo "=====" #docker compose --env-file $ENVFILE -p $PROJECT -f docker/matomo-w-db.yml up -d --no-build # docker-compose-rest.yml must be last, since it specifies network in more detail. If it is not last, there is "root must be a mapping" error. -docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en -o dataquest -docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli user --add -m user@test.edu -g meno -s priezvisko -l en -p user -o dataquest +docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli create-administrator -e dspace.admin.dev@dataquest.sk -f admin -l user -p admin -c en -o dataquest +docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli user --add -m dspace.user.dev@dataquest.sk -g meno -s priezvisko -l en -p user -o dataquest docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli version echo "=====" diff --git a/docker/README.md b/docker/README.md index 37d071a86f8..994cc98736e 100644 --- a/docker/README.md +++ b/docker/README.md @@ -114,7 +114,7 @@ docker-compose -p d7 -f docker/docker-compose-dist.yml up -d Create an administrator ``` -docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en +docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e dspace.admin.dev@dataquest.sk -f admin -l user -p admin -c en ``` Load content from AIP files diff --git a/docker/cli.ingest.yml b/docker/cli.ingest.yml index 2f812cde038..007309545bc 100644 --- a/docker/cli.ingest.yml +++ b/docker/cli.ingest.yml @@ -17,7 +17,7 @@ services: dspace-cli: environment: - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/main/dogAndReport.zip - - ADMIN_EMAIL=test@test.edu + - ADMIN_EMAIL=dspace.admin.dev@dataquest.sk - AIPDIR=/tmp/aip-dir entrypoint: - /bin/bash