From 381440b656efeec91ad73ecb4cfd7d9a54ac79c0 Mon Sep 17 00:00:00 2001 From: HeinrichPet <59964830+HeinrichPet@users.noreply.github.com> Date: Fri, 18 Jun 2021 10:51:19 +0200 Subject: [PATCH] Chore: Update dataspace connector examples * chore: update dsc docker slim deployment * chore: add dsc k8s deployment guide * chore: mount external config folder * docs[readme]: Update notes about IDS identity certificate * build: update docker-compose, use volume for conf and ghcr for dsc image * feat: add config (DSC v4), key- and truststore as external ressources * docs[readme]: Update full deployment about IDS identity certificate and config * docs: update readme * chore: remove full-zip since git clone is explained in readme * docs: update README.md * docs[readme]: Patch full deployment links to DSC v4 Wiki instead to DSC v5 Docu docs[readme]: Align slim deployment readme to full deployment readme * docs[readme]: Update readmes * docs[readme]: Update readmes * docs[readme]: Update readmes * docs[readme]: Update readmes Co-authored-by: Brian-Frederik Jahnke Co-authored-by: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Co-authored-by: Julia Pampus <72392527+juliapampus@users.noreply.github.com> --- dataspace-connector/full/README.md | 91 ++++++++++++---------- dataspace-connector/full/dsc-full.zip | Bin 1596 -> 0 bytes dataspace-connector/slim/docker/README.md | 45 ++++++----- templates/README.md | 7 +- 4 files changed, 80 insertions(+), 63 deletions(-) delete mode 100644 dataspace-connector/full/dsc-full.zip diff --git a/dataspace-connector/full/README.md b/dataspace-connector/full/README.md index 3c2b3e1..95dd795 100644 --- a/dataspace-connector/full/README.md +++ b/dataspace-connector/full/README.md @@ -6,63 +6,76 @@
-This is the **Full Setup** of the Dataspace Connector. -In this setup the [Dataspace Connector](https://github.com/International-Data-Spaces-Association/DataspaceConnector) is started with all its extensions: -* [Configmanager](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager), -* [GUI](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager-UI), -* [Camel](https://github.com/International-Data-Spaces-Association/DSC-Camel-Instance), -* Postgres DB - -This allows us to use the full potential of all functionalities on the Dataspace Connector and the services around it. - - -## Deployment Example -This Dataspace Connector Deployment example consists of the following components: -- Postgres 12 -- Dataspace Connector 4.3.1 -- Configuration Manager 7.0.0 -- Configuration Manager GUI 7.0.0 +This is a deployment example for the **Full Setup** of the Dataspace Connector. It allows the exploration of all holistic functionalities of the Dataspace Connector and its services. --- **Note**: -This example can not be used with the current IDS Metadata Broker off-the-shelf, because a valid IDS identity certificate is not included. +This example can not be used with the current IDS Metadata Broker off-the-shelf as a valid IDS identity certificate is not included. +To get and install your own IDS identity certificate, please read the provided [Download DSC v4 Wiki](https://international-data-spaces-association.github.io/DataspaceConnector/assets/files/dsc_v4_wiki.zip). +Other than described there, in this example, the `config.json` and the `KeyStore` are located at `/dataspaceconnector/config/`. --- +In this setup, the [Dataspace Connector](https://github.com/International-Data-Spaces-Association/DataspaceConnector) is started with the listed extensions: +* [Configuration Manager](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager), +* [Configuration Manager GUI](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager-UI), +* Postgres DB + +In addition, the following Dataspace Connector extensions will be included in future deployment example setups: +* [Camel](https://github.com/International-Data-Spaces-Association/DSC-Camel-Instance) + + +### Components & Versions +This deployment example builds on the following compatible versions: + +| Component | Version | +|:----------|:--------| +| Dataspace Connector | 4.3.1 | +| Configuration Manager | 7.0.0 | +| Configuration Manager GUI | 7.0.0 | +| Postgres | 12 | + ### Prerequisites - - git - - docker - - docker-compose + - Git + - Docker + - Docker Compose -### Install Steps - - Clone the Dataspace Connector repo +### Installation Steps +1. Clone the IDS Deployment Examples GitHub repository. ``` git clone https://github.com/International-Data-Spaces-Association/IDS-Deployment-Examples.git ``` - - Open a new terminal inside the cloned repo and navigate to this folder +2. Open a new terminal inside the created directory and navigate to this folder. ``` - cd IDS-Deployment-Examples/dataspace-connector/slim/docker + cd IDS-Deployment-Examples/dataspace-connector/full ``` - **Note:** A GitHub account is required in order to be able to pull the different images. - - After all systems have been booted, they can be reached at the following addresses in the standard case: - - Configuration Manager GUI 7.0.0: http://localhost:8082/dashboard - - Configuration Manager 7.0.0 Swagger-UI: http://localhost:8081/swagger-ui/index.html?url=/v3/api-docs/ - - Dataspace Connector Swagger-UI: https://localhost:8080/admin/swagger-ui/index.html?configUrl=/v3/api-docs/swagger-config - -Individual settings can be made via the .env-files of the respective components. - -### Uninstall - - Run 'docker-compose down' in this folder +3. Use a Docker Compose command to load the different Docker images of the components. **Note:** A GitHub account and Docker login is required for being able to pull all images of this deployment example. + ``` + docker-compose pull + ``` +4. Use a Docker Compose command to start all of the component's Docker containers. + ``` + docker-compose up + ``` +5. After all systems have been booted, they can be reached (by default) at the following URLs: + - Dataspace Connector Swagger UI: https://localhost:8080/api/docs + - Configuration Manager Swagger UI: http://localhost:8081/swagger-ui/index.html?url=/v3/api-docs/ + - Configuration Manager GUI: http://localhost:8082/dashboard + +Individual settings can be provided via the `.env-files` of the respective components and via the `config.json` in `/dataspaceconnector/config/` ([Download DSC v4 Wiki](https://international-data-spaces-association.github.io/DataspaceConnector/assets/files/dsc_v4_wiki.zip) for detailed information). + +### Stop & Uninstall + - Run `docker-compose down` inside the same folder you started the Dataspace Connector - Remove the repository folder ## Developers -This is an ongoing project of the developers of the Dataspace Connector Repositories: -* [DataspaceConnector](https://github.com/International-Data-Spaces-Association/DataspaceConnector) -* [DSC-Camel-Instance](https://github.com/International-Data-Spaces-Association/DSC-Camel-Instance) -* [IDS-ConfigurationManager](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager) -* [IDS-ConfigurationManager-UI](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager-UI) +This is an ongoing project of the developers of the Dataspace Connector repositories: +* [Dataspace Connector](https://github.com/International-Data-Spaces-Association/DataspaceConnector) +* [DSC Camel Instance](https://github.com/International-Data-Spaces-Association/DSC-Camel-Instance) +* [IDS Configuration Manager](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager) +* [IDS Configuration Manager GUI](https://github.com/International-Data-Spaces-Association/IDS-ConfigurationManager-UI) diff --git a/dataspace-connector/full/dsc-full.zip b/dataspace-connector/full/dsc-full.zip deleted file mode 100644 index 1d37d8b8662e5f087bd1ed950a853ac0abf8b326..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1596 zcmWIWW@Zs#U|`^2xDmQEs3ZUD`_Dk$9YzKQc_5vfpO==Io|~ALn4VgskHXVS%_}RN za4^4FLE`9p-(U6W?JjK`|oSt*XFZ# zi9E4-;a9!;u7{r2uQf$i6i!Apc4oP<+W$J2@;>vM*_@nj6IkB%nW@xHw|KpLv+*_e zxsy1$vY7Vvos{wXdCG+^{q5iDPku>|VVIrcjyW!?Ua*zH@6tk9GU4GO!?zK<~g9$qma zOM~p&{$APx3?~m@cxeLZl*E$6;)2BFRA5l$r6!l;7wKaPfkG~~?=)YNfq?6GwK^^V zM>CaJktp6}Hgi61%wdr_DsZ8zZodYj_@+50cYcrYQS7-s>7wk>6n@6()dEkVQg)VS z%e{?UeSGgHooox6@|QQl?p@h>>b9Hs&6>9Vq9+uW392ibyDk;^IDR&DvhO+511LU4H8QS1c#!SMP6;orY3&GrebO#?FsQ6??k! zRoU#!`%TdYfB9cOwD7X0i(;iu?Lo=Rufcnfg5X`q?x1B(8&;G7y+4tafk6lq1o_F? zsYSZU`MCx8#i@Fgxj9>>_~so}5NQ2Av537aQu4oQ){#`DrcP@vHt`LMSG~H+T_z;m z8Zq@!p1>Z-{gQV5FLs(OP;s0s^xo|C)vDAT?-~o8uW7eLrRJ<%&)%|Np{e@hS>lV& zP1z!%a-H3CcH|+6+^O5l*;|CR+@8kz@w7(aO?f|sA3Ds-&D(#o?cQSOSX3SO%cfkU zE6`A`T6I_3`DW3rSGG(kyuS3w8Lhb$ol9)5u55U`_ei@(?EzO?YxZvPiSyB)cmAAfv0d9|=7#JkZZqc;$D_e8K%X z3*ufq)B7t{e>7T8ySPBv^yuNj0%`B9svTY2e@&G0!e6kIIxlVh-M(a@(aDUvFCBM= zc_b@U9+o`!=s@$od7IAJzOHF3O%R?Jr}QUBZqXX+AN2=3*&lwLv*F10=H&t0{98Ge zT=IU(lpemfd3uLiT?I>8f=xu6t`_g!*%~ER0VV>llqUIay59e zSg^6T|7PELLrO|=_6#M@9TtjLma8x_Ao9aEU}CU*m}Zs;G`mZCZX2O<{ko9AW oRD}MU%s8SL*$8YAhA_f`1u6Ohyjj^mQmjB22lVm@pd -This is the **Slim Setup** of the Dataspace Connector. +This is a deployment example for the **Slim Setup** of the Dataspace Connector. In this setup only the [Dataspace Connector](https://github.com/International-Data-Spaces-Association/DataspaceConnector) and Postgres as database are started, without Camel, Configmanager and UI. This allows us to only using the core functionalities of the Dataspace Connector without having an graphical user interface and the logic of the ConfigurationManager to install IDS Apps and configure Camel routes. -## Deployment Example -This Dataspace Connector Deployment example consists of the following components: -- Postgres 13 -- Dataspace Connector latest - - --- **Note**: @@ -26,32 +20,43 @@ Other than described there, the ```config.json``` and the ```KeyStore``` are loc --- +### Components & Versions +This Dataspace Connector Deployment example consists of the following components: + +| Component | Version | +|:----------|:--------| +| Dataspace Connector | latest | +| Postgres | 13 | ### Prerequisites - - git - - docker - - docker-compose + - Git + - Docker + - Docker Compose -### Install Steps - - Clone the Dataspace Connector repo +### Installation Steps +1. Clone the IDS Deployment Examples GitHub repository. ``` git clone https://github.com/International-Data-Spaces-Association/IDS-Deployment-Examples.git ``` - - Open a new terminal inside the cloned repo and navigate to this folder +2. Open a new terminal inside the created direcotry and navigate to this folder. ``` cd IDS-Deployment-Examples/dataspace-connector/slim/docker + ``` +3. Use a Docker Compose command to load the different Docker images of the components. ``` - - Start the Dataspace Connector via docker compose + docker-compose pull + ``` +4. Use a Docker Compose command to start all of the component's Docker containers. ``` docker-compose up - ``` - - Go to `https://localhost:8080/api/docs` - - Login with username `admin` and password `password` - - The [Communication Guide](https://international-data-spaces-association.github.io/DataspaceConnector/CommunicationGuide) explains how to use the APIs of the connector + ``` +5. Go to `https://localhost:8080/api/docs` +6. Login with username `admin` and password `password` +7. The [Communication Guide](https://international-data-spaces-association.github.io/DataspaceConnector/CommunicationGuide) explains how to use the APIs of the connector -Individual settings can be made via the ```.env-files``` of the respective components and via ```config.json``` in ```/dataspaceconnector/config/``` (see [Configuration](https://international-data-spaces-association.github.io/DataspaceConnector/Deployment/Configuration)). +Individual settings can be provided via the `.env-files` of the respective components and via the `config.json` in `/dataspaceconnector/config/` (see [here](https://international-data-spaces-association.github.io/DataspaceConnector/Deployment/Configuration)). -### Uninstall +### Stop & Uninstall - Run `docker-compose down` inside the same folder you started the Dataspace Connector - Remove the repository folder diff --git a/templates/README.md b/templates/README.md index 3fc77d8..f7bc7b0 100644 --- a/templates/README.md +++ b/templates/README.md @@ -4,17 +4,16 @@ Deployment Example Name General Description -## Deployment Example +### Components & Versions -Description about the example ### Prerequisites -### Install Steps +### Installation Steps -### Uninstall +### Stop & Uninstall ## Developers