From 9974a4770e7189e8c6664d0c2e425254162f352c Mon Sep 17 00:00:00 2001 From: Jan Range <30547301+JR-1991@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:20:55 +0100 Subject: [PATCH 1/5] set `alpha` as default --- action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 8bdb1df..a204723 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ inputs: image_tag: description: "Tag of image for Dataverse app and Configbaker" required: true - default: "unstable" + default: "alpha" image_dataverse: description: "Name of Dataverse app image (can include registry)" required: true @@ -103,4 +103,4 @@ runs: version=$(curl -s 'http://localhost:8080/api/info/version' | jq -r '.data.version') echo "dv_version=$version" >>"$GITHUB_OUTPUT" - echo "::endgroup::" \ No newline at end of file + echo "::endgroup::" From 2fce13d2fc7bac337b22c69dbaae27bafb354c8c Mon Sep 17 00:00:00 2001 From: Jan Range Date: Wed, 3 Apr 2024 11:11:13 +0200 Subject: [PATCH 2/5] add JVM args for `pid` Changed `environments` also to an object --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 209a812..b890a7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,15 @@ services: - DATAVERSE_DB_HOST=postgres - DATAVERSE_DB_USER=${DATAVERSE_DB_USER} - DATAVERSE_DB_PASSWORD=${DATAVERSE_DB_PASSWORD} + DATAVERSE_DB_HOST: postgres + DATAVERSE_DB_USER: ${DATAVERSE_DB_USER} + DATAVERSE_DB_PASSWORD: ${DATAVERSE_DB_PASSWORD} + JVM_ARGS: -Ddataverse.pid.providers=fake + -Ddataverse.pid.default-provider=fake + -Ddataverse.pid.fake.type=FAKE + -Ddataverse.pid.fake.label=FakeDOIProvider + -Ddataverse.pid.fake.authority=10.5072 + -Ddataverse.pid.fake.shoulder=FK2/ ports: - '8080:8080' networks: From b18f199cc5181aa382852c8fe1c24e4aefc3bb59 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 4 Apr 2024 11:02:51 +0200 Subject: [PATCH 3/5] revert(action): rollback to using unstable tag as default We still want to opt to default to the latest development version of Dataverse for testing. --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index a204723..760e15d 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ inputs: image_tag: description: "Tag of image for Dataverse app and Configbaker" required: true - default: "alpha" + default: "unstable" image_dataverse: description: "Name of Dataverse app image (can include registry)" required: true From e85b82b2c6ae6ed635abf4111c178704382675a8 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 4 Apr 2024 11:03:28 +0200 Subject: [PATCH 4/5] fix(compose): resolve mixed style env var declarations --- docker-compose.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b890a7d..0e44219 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,18 +8,17 @@ services: restart: on-failure user: payara environment: - - DATAVERSE_DB_HOST=postgres - - DATAVERSE_DB_USER=${DATAVERSE_DB_USER} - - DATAVERSE_DB_PASSWORD=${DATAVERSE_DB_PASSWORD} + # Database Connection DATAVERSE_DB_HOST: postgres DATAVERSE_DB_USER: ${DATAVERSE_DB_USER} DATAVERSE_DB_PASSWORD: ${DATAVERSE_DB_PASSWORD} - JVM_ARGS: -Ddataverse.pid.providers=fake - -Ddataverse.pid.default-provider=fake - -Ddataverse.pid.fake.type=FAKE - -Ddataverse.pid.fake.label=FakeDOIProvider - -Ddataverse.pid.fake.authority=10.5072 - -Ddataverse.pid.fake.shoulder=FK2/ + # Simple PID Provider Setup (as necessary since Dataverse 6.2) + DATAVERSE_PID_PROVIDERS: fake + DATAVERSE_PID_DEFAULT_PROVIDER: fake + DATAVERSE_PID_FAKE_TYPE: FAKE + DATAVERSE_PID_FAKE_LABEL: Fake DOI Provider + DATAVERSE_PID_FAKE_AUTHORITY: 10.5072 + DATAVERSE_PID_FAKE_SHOULDER: FK2/ ports: - '8080:8080' networks: From aa56ab034d45b81800f3d140ddbda08007b3b7e2 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 4 Apr 2024 11:03:38 +0200 Subject: [PATCH 5/5] chore: add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ecd1f75 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# IDE folders +.idea/