From 8503a3288bb0e5d5e4ff6fedb8aa1923ee096f94 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Thu, 22 Aug 2024 10:47:11 -0400 Subject: [PATCH] use DATAVERSE_SITEURL instead of _CT_ version #10756 The _CT_ version is not needed now that we have upgraded to Payara 6.2024.6 in #10495 which included this fix: https://github.com/payara/Payara/pull/6550 --- doc/sphinx-guides/source/container/running/demo.rst | 2 -- docker/compose/demo/compose.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/sphinx-guides/source/container/running/demo.rst b/doc/sphinx-guides/source/container/running/demo.rst index 0508639c616..f9642347558 100644 --- a/doc/sphinx-guides/source/container/running/demo.rst +++ b/doc/sphinx-guides/source/container/running/demo.rst @@ -124,8 +124,6 @@ Some JVM options can be configured as environment variables. For example, you ca We are in the process of making more JVM options configurable as environment variables. Look for the term "MicroProfile Config" in under :doc:`/installation/config` in the Installation Guide to know if you can use them this way. -Please note that for a few environment variables (the ones that start with ``%ct`` in :download:`microprofile-config.properties <../../../../../src/main/resources/META-INF/microprofile-config.properties>`), you have to prepend ``_CT_`` to make, for example, ``_CT_DATAVERSE_SITEURL``. We are working on a fix for this in https://github.com/IQSS/dataverse/issues/10285. - There is a final way to configure JVM options that we plan to deprecate once all JVM options have been converted to MicroProfile Config. Look for "magic trick" under "tunables" at :doc:`../app-image` for more information. Database Settings diff --git a/docker/compose/demo/compose.yml b/docker/compose/demo/compose.yml index e6ffc9f392a..33e7b52004b 100644 --- a/docker/compose/demo/compose.yml +++ b/docker/compose/demo/compose.yml @@ -9,7 +9,7 @@ services: restart: on-failure user: payara environment: - _CT_DATAVERSE_SITEURL: "https://demo.example.org" + DATAVERSE_SITEURL: "https://demo.example.org" DATAVERSE_DB_HOST: postgres DATAVERSE_DB_PASSWORD: secret DATAVERSE_DB_USER: dataverse