each container has its dedicated page; moved components inside contai…

…ners.

sample/md/README.md

@@ -4,6 +4,7 @@
 
 [png](./images/landscape.png) | [svg](./images/landscape.svg)
 
+
 ## Software Systems
 
  - [App 2](software-systems/App%202/README.md)

sample/md/software-systems/App 2/Database/README.md

@@ -0,0 +1,16 @@
+# Database
+
+## Components
+
+## Diagrams
+
+
+## Relationships
+
+### Called by
+
+| Source Software System | Source Container | Source Component | Target Software System | Target Container | Target Component | Description |
+| --- | --- | --- | --- | --- | --- | --- |
+| App 2 | Web Application 2: []()%$&à\èéìù/ | Web Service 3 | App 2 | Database |  |  |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | App 2 | Database |  |  |
+

sample/md/software-systems/App 2/README.md

@@ -4,11 +4,12 @@
 
 ### App 2 - System Context
 
-description: System Context of App 2
+Description: System Context of App 2
 ![system_context App 2](../../images/system_context%20App%202.png)
 
 [png](../../images/system_context%20App%202.png) | [svg](../../images/system_context%20App%202.svg)
 
+
 ## Containers
 
 | Container | Description |
@@ -19,24 +20,11 @@ description: System Context of App 2
 
 ### App 2 - Containers
 
-description: Container view of App 2
+Description: Container view of App 2
 ![container App 2](../../images/container%20App%202.png)
 
 [png](../../images/container%20App%202.png) | [svg](../../images/container%20App%202.svg)
 
-## Components
-
-| Container | Component | Description |
-| --- | --- | --- |
-| Web Application 2: []()%$&à\èéìù/ | Web Service 3 |  |
-| Web Application 2: []()%$&à\èéìù/ | Web Service 4 |  |
-
-### App 2 - Web Application 2: []()%$&à\èéìù/ - Components
-
-description: Component view of Web Application 2: []()%$&à\èéìù/
-![component App 2 Web Application 2_ _______à_èéìù_](../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.png)
-
-[png](../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.png) | [svg](../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.svg)
 
 ## Relationships
 

sample/md/software-systems/App 2/Web Application 2_ _______à_èéìù_/README.md

@@ -0,0 +1,32 @@
+# Web Application 2: []()%$&à\èéìù/
+
+## Components
+
+| Component | Description |
+| --- | --- |
+| Web Service 3 |  |
+| Web Service 4 |  |
+
+## Diagrams
+
+### App 2 - Web Application 2: []()%$&à\èéìù/ - Components
+
+Description: Component view of Web Application 2: []()%$&à\èéìù/
+
+![component App 2 Web Application 2_ _______à_èéìù_](../../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.png)
+
+[png](../../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.png) | [svg](../../../images/component%20App%202%20Web%20Application%202_%20_______à_èéìù_.svg)
+
+
+## Relationships
+
+### Calls
+
+| Source Software System | Source Container | Source Component | Target Software System | Target Container | Target Component | Description |
+| --- | --- | --- | --- | --- | --- | --- |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | App 2 | Database |  |  |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | Spring PetClinic | Web Application |  | test 1 |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | Spring PetClinic | Web Application | Web Service 1 | test 2 |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | Spring PetClinic | Web Application | Web Service 2 | test 1 |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | Spring PetClinic |  |  | test 1 |
+

sample/md/software-systems/App 2/test_______/README.md

@@ -0,0 +1,9 @@
+# test_:%<>|?
+
+## Components
+
+## Diagrams
+
+
+## Relationships
+

sample/md/software-systems/App 3/README.md

@@ -4,11 +4,12 @@
 
 ### App 3 - System Context
 
-description: System Context of App 3
+Description: System Context of App 3
 ![system_context App 3](../../images/system_context%20App%203.png)
 
 [png](../../images/system_context%20App%203.png) | [svg](../../images/system_context%20App%203.svg)
 
+
 ## Containers
 
 | Container | Description |
@@ -17,13 +18,11 @@ description: System Context of App 3
 
 ### App 3 - Containers
 
-description: Container view of App 3
+Description: Container view of App 3
 ![container App 3](../../images/container%20App%203.png)
 
 [png](../../images/container%20App%203.png) | [svg](../../images/container%20App%203.svg)
 
-## Components
-
 
 ## Relationships
 

sample/md/software-systems/App 3/Web Application 3/README.md

@@ -0,0 +1,9 @@
+# Web Application 3
+
+## Components
+
+## Diagrams
+
+
+## Relationships
+

sample/md/software-systems/App 4/README.md

@@ -4,22 +4,21 @@
 
 ### App 4 - System Context
 
-description: System Context of App 4
+Description: System Context of App 4
 ![system_context App 4](../../images/system_context%20App%204.png)
 
 [png](../../images/system_context%20App%204.png) | [svg](../../images/system_context%20App%204.svg)
 
+
 ## Containers
 
 ### App 4 - Containers
 
-description: Container view of App 4
+Description: Container view of App 4
 ![container App 4](../../images/container%20App%204.png)
 
 [png](../../images/container%20App%204.png) | [svg](../../images/container%20App%204.svg)
 
-## Components
-
 
 ## Relationships
 

sample/md/software-systems/App 5____!!_ _______à_èéìù_/README.md

@@ -4,22 +4,21 @@
 
 ### App 5()[]!!: []()%$&à\èéìù/ - System Context
 
-description: System Context of App 5()[]!!: []()%$&à\èéìù/
+Description: System Context of App 5()[]!!: []()%$&à\èéìù/
 ![system_context App 5____!!_ _______à_èéìù_](../../images/system_context%20App%205____!!_%20_______à_èéìù_.png)
 
 [png](../../images/system_context%20App%205____!!_%20_______à_èéìù_.png) | [svg](../../images/system_context%20App%205____!!_%20_______à_èéìù_.svg)
 
+
 ## Containers
 
 ### App 5()[]!!: []()%$&à\èéìù/ - Containers
 
-description: Container view of App 5()[]!!: []()%$&à\èéìù/
+Description: Container view of App 5()[]!!: []()%$&à\èéìù/
 ![container App 5____!!_ _______à_èéìù_](../../images/container%20App%205____!!_%20_______à_èéìù_.png)
 
 [png](../../images/container%20App%205____!!_%20_______à_èéìù_.png) | [svg](../../images/container%20App%205____!!_%20_______à_èéìù_.svg)
 
-## Components
-
 
 ## Relationships
 

sample/md/software-systems/Spring PetClinic/Database/README.md

@@ -0,0 +1,16 @@
+# Database
+
+## Components
+
+## Diagrams
+
+
+## Relationships
+
+### Called by
+
+| Source Software System | Source Container | Source Component | Target Software System | Target Container | Target Component | Description |
+| --- | --- | --- | --- | --- | --- | --- |
+| Spring PetClinic | Web Application | Web Service 1 | Spring PetClinic | Database |  | Reads from and writes to |
+| Spring PetClinic | Web Application |  | Spring PetClinic | Database |  | Reads from and writes to |
+

sample/md/software-systems/Spring PetClinic/README.md

@@ -4,11 +4,12 @@
 
 ### Spring PetClinic - System Context
 
-description: System Context of Spring PetClinic
+Description: System Context of Spring PetClinic
 ![system_context Spring PetClinic](../../images/system_context%20Spring%20PetClinic.png)
 
 [png](../../images/system_context%20Spring%20PetClinic.png) | [svg](../../images/system_context%20Spring%20PetClinic.svg)
 
+
 ## Containers
 
 | Container | Description |
@@ -18,24 +19,11 @@ description: System Context of Spring PetClinic
 
 ### Spring PetClinic - Containers
 
-description: Container view of Spring PetClinic
+Description: Container view of Spring PetClinic
 ![container Spring PetClinic](../../images/container%20Spring%20PetClinic.png)
 
 [png](../../images/container%20Spring%20PetClinic.png) | [svg](../../images/container%20Spring%20PetClinic.svg)
 
-## Components
-
-| Container | Component | Description |
-| --- | --- | --- |
-| Web Application | Web Service 1 |  |
-| Web Application | Web Service 2 |  |
-
-### Spring PetClinic - Web Application - Components
-
-description: Component view of Web Application
-![component Spring PetClinic Web Application](../../images/component%20Spring%20PetClinic%20Web%20Application.png)
-
-[png](../../images/component%20Spring%20PetClinic%20Web%20Application.png) | [svg](../../images/component%20Spring%20PetClinic%20Web%20Application.svg)
 
 ## Relationships
 
@@ -78,3 +66,4 @@ description: Component view of Web Application
 
 [png](../../images/AmazonWebServicesDeployment.png) | [svg](../../images/AmazonWebServicesDeployment.svg)
 
+

sample/md/software-systems/Spring PetClinic/Web Application/README.md

@@ -0,0 +1,37 @@
+# Web Application
+
+## Components
+
+| Component | Description |
+| --- | --- |
+| Web Service 1 |  |
+| Web Service 2 |  |
+
+## Diagrams
+
+### Spring PetClinic - Web Application - Components
+
+Description: Component view of Web Application
+
+![component Spring PetClinic Web Application](../../../images/component%20Spring%20PetClinic%20Web%20Application.png)
+
+[png](../../../images/component%20Spring%20PetClinic%20Web%20Application.png) | [svg](../../../images/component%20Spring%20PetClinic%20Web%20Application.svg)
+
+
+## Relationships
+
+### Called by
+
+| Source Software System | Source Container | Source Component | Target Software System | Target Container | Target Component | Description |
+| --- | --- | --- | --- | --- | --- | --- |
+| App 2 | Web Application 2: []()%$&à\èéìù/ | Web Service 4 | Spring PetClinic | Web Application |  | test 1 |
+| App 2 | Web Application 2: []()%$&à\èéìù/ |  | Spring PetClinic | Web Application |  | test 1 |
+| App 2 |  |  | Spring PetClinic | Web Application |  | test 1 |
+| User |  |  | Spring PetClinic | Web Application |  | Access to user data |
+
+### Calls
+
+| Source Software System | Source Container | Source Component | Target Software System | Target Container | Target Component | Description |
+| --- | --- | --- | --- | --- | --- | --- |
+| Spring PetClinic | Web Application |  | Spring PetClinic | Database |  | Reads from and writes to |
+

src/main/java/it/vitalegi/structurizr/md/GenerateMarkdownApp.java

@@ -2,6 +2,7 @@
 
 import com.structurizr.Workspace;
 import com.structurizr.view.View;
+import it.vitalegi.structurizr.md.markdown.ContainerPage;
 import it.vitalegi.structurizr.md.markdown.LandscapePageService;
 import it.vitalegi.structurizr.md.markdown.SoftwareSystemPage;
 import it.vitalegi.structurizr.md.model.MdContext;
@@ -61,10 +62,13 @@ public void createImages() {
     public void createMd() {
 
         loadViews(ctx.getWorkspace());
-        new LandscapePageService(ctx).createLandscapePage();
+        new LandscapePageService(ctx).createPage();
 
         var ssp = new SoftwareSystemPage(ctx);
-        ctx.getSoftwareSystemsSorted().forEach(ssp::softwareSystemPage);
+        ctx.getSoftwareSystemsSorted().forEach(ssp::createPage);
+
+        var containerPage = new ContainerPage(ctx);
+        ctx.getContainersSorted().forEach(containerPage::createPage);
     }
 
     protected void loadViews(Workspace workspace) {