From d27bf6c3c2bb7b8bbc59bd5d2c9477f5a31f2574 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 18 Jan 2024 16:35:57 +0100 Subject: [PATCH 1/2] Updated README installation --- CHANGELOG.md | 4 ++++ README.md | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98fcdf87..84aac29a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret. +## [Under udvikling] + +* Opdaterede installationsguide. + ## [2.7.3] 2024-01-16 * Opdaterede til [OS2Forms Organisation diff --git a/README.md b/README.md index 85453433..faa41a42 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ local machine for development and testing purposes. ```sh docker network create frontend + +# Important: If there is no need for organisation data you must also create the following network. +docker network create serviceplatformen_organisation_api_app +# If you wish to use organisation +# @see https://github.com/itk-dev/serviceplatformen_organisation_api?tab=readme-ov-file#using-the-api-from-another-docker-compose-setup + docker compose pull docker compose up --detach From 74f5935e5bee904ec64f9d3b90ccc68329cac17e Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 18 Jan 2024 21:11:15 +0100 Subject: [PATCH 2/2] Updated README --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index faa41a42..8f1288b3 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,6 @@ local machine for development and testing purposes. ```sh docker network create frontend - -# Important: If there is no need for organisation data you must also create the following network. -docker network create serviceplatformen_organisation_api_app -# If you wish to use organisation -# @see https://github.com/itk-dev/serviceplatformen_organisation_api?tab=readme-ov-file#using-the-api-from-another-docker-compose-setup - docker compose pull docker compose up --detach @@ -40,6 +34,17 @@ docker compose run --rm node yarn --cwd web/themes/custom/os2forms_selvbetjening open $(docker compose exec phpfpm vendor/bin/drush --uri=http://$(docker compose port nginx 8080) user:login) ``` +The development setup depends on the `serviceplatformen_organisation_api_app` +network which is used to access the API from +[Serviceplatformen organisation API](https://github.com/itk-dev/serviceplatformen_organisation_api). +If you start that project (cf. [Getting started](https://github.com/itk-dev/serviceplatformen_organisation_api/blob/develop/README.md#getting-started)), +you're good to go. If you don't need the API during development, +you can manually create the network by running + +```sh +docker network create serviceplatformen_organisation_api_app +``` + ### Configuration Some modules included in this project needs additional configuration.