From f73ba7079cb4511031829fe8c27c49cac382849c Mon Sep 17 00:00:00 2001 From: Blake Nedved Date: Mon, 4 Nov 2024 22:28:26 -0500 Subject: [PATCH 1/2] Removed unnecessary duplicate dev env setup --- doc_source/index.rst | 1 - doc_source/source/dev/environment_setup.rst | 34 --------------------- doc_source/source/index.rst | 1 - 3 files changed, 36 deletions(-) delete mode 100644 doc_source/source/dev/environment_setup.rst diff --git a/doc_source/index.rst b/doc_source/index.rst index 7cf70b455..9df859a4d 100644 --- a/doc_source/index.rst +++ b/doc_source/index.rst @@ -73,7 +73,6 @@ by subsequent documents on this site. :caption: Development dev/project - dev/environment_setup dev/design dev/release dev/roadmap diff --git a/doc_source/source/dev/environment_setup.rst b/doc_source/source/dev/environment_setup.rst deleted file mode 100644 index 84e866935..000000000 --- a/doc_source/source/dev/environment_setup.rst +++ /dev/null @@ -1,34 +0,0 @@ -============================= -Development Environment Setup -============================= - -Globus Setup -============ - -#. Log in to `Globus `_. -#. Navigate to Settings > Developers > Add Project. -#. Select an accurate name and contact email for your project. -#. Navigate to Add an App > Advanced Registration. -#. Choose an accurate name for your app, and in the redirects field add the single redirect ``https://localhost/ui/authn`` -#. Click Add Client Secret and choose a descriptive name. -#. Take note of the Secret that it generates and the Client UUID of the Globus application and remember them for future steps. - -Compose Setup -============= - -#. Download the `DataFed Github Repository `_. -#. Checkout to the ``devel`` branch. -#. Navigate into the ``compose`` folder and run ``./build_images_for_compose.sh`` - - * Note: If you are building the images for the first time, it will take a while, however subsequent builds will use cached dependencies to accelerate the process. -#. Run the ``./generate_env.sh`` script, which will generate a ``.env`` file at this location and a self-signed certificate for the web interface to use. -#. Edit the ``.env`` file and set values for the following environment variables: - - * ``DATAFED_GLOBUS_APP_SECRET``: The app secret from the Globus setup - * ``DATAFED_GLOBUS_APP_ID``: The app UUID from the Globus setup - * ``DATAFED_ZEROMQ_SESSION_SECRET``: This can be any string - * ``DATAFED_ZEROMQ_SYSTEM_SECRET``: This can be any string -#. Edit any other values in the ``.env`` file to fit your development needs. -#. Finally, run ``docker compose -f ./compose_core.yml up``, and after a few minutes the DataFed containers should be started and the web application should be accessible from https://localhost:443/ - - * Note: Since the web interface is using a self-signed certificate your browser may not trust it, however, in this case it is safe to bypass this protection to visit the web app. diff --git a/doc_source/source/index.rst b/doc_source/source/index.rst index 7cf70b455..9df859a4d 100644 --- a/doc_source/source/index.rst +++ b/doc_source/source/index.rst @@ -73,7 +73,6 @@ by subsequent documents on this site. :caption: Development dev/project - dev/environment_setup dev/design dev/release dev/roadmap From f1c4a0c39807d8a14e1e03efedeee2b7c65d2497 Mon Sep 17 00:00:00 2001 From: Blake Nedved Date: Wed, 6 Nov 2024 06:33:02 -0500 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 712b0733e..b039df1c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ 8. [973] - Adds log output at the end of CI test pipeline 9. [968] - Adds the ability to specify both base and root path when creating Globus collections. +10. [1005] - Consolidate Development Environment setup documentation. ## PATCH Bug fixes/Technical Debt/Documentation