diff --git a/doc/applications/images-list-apps.csv b/doc/applications/attachments/images-list-apps.csv similarity index 100% rename from doc/applications/images-list-apps.csv rename to doc/applications/attachments/images-list-apps.csv diff --git a/doc/applications/images-list-basic.csv b/doc/applications/attachments/images-list-basic.csv similarity index 100% rename from doc/applications/images-list-basic.csv rename to doc/applications/attachments/images-list-basic.csv diff --git a/doc/applications/images-list-services.csv b/doc/applications/attachments/images-list-services.csv similarity index 100% rename from doc/applications/images-list-services.csv rename to doc/applications/attachments/images-list-services.csv diff --git a/doc/applications/map-services.csv b/doc/applications/attachments/map-services.csv similarity index 100% rename from doc/applications/map-services.csv rename to doc/applications/attachments/map-services.csv diff --git a/doc/applications/images-list.rst b/doc/applications/images-list.rst index d1a7039..a535d45 100644 --- a/doc/applications/images-list.rst +++ b/doc/applications/images-list.rst @@ -5,14 +5,14 @@ Basic and runtime images ------------------------ .. csv-table:: - :file: images-list-basic.csv + :file: attachments/images-list-basic.csv :header-rows: 1 Common service images --------------------- .. csv-table:: - :file: images-list-services.csv + :file: attachments/images-list-services.csv :header-rows: 1 List of application images @@ -21,5 +21,5 @@ List of application images All application images have the application user UID/GID 8080 and listen on internal port 8080 (HTTP). .. csv-table:: - :file: images-list-apps.csv + :file: attachments/images-list-apps.csv :header-rows: 1 diff --git a/doc/applications/map-services.rst b/doc/applications/map-services.rst index c3a3278..cd7f2ae 100644 --- a/doc/applications/map-services.rst +++ b/doc/applications/map-services.rst @@ -2,7 +2,7 @@ Map services used in applications ================================= .. csv-table:: - :file: map-services.csv + :file: attachments/map-services.csv :header-rows: 1 1. Used by CKAN extensions *reclineview*, *spatial* and *geoview*. diff --git a/doc/toolchain/attachments/schema-arch-interop.png b/doc/toolchain/attachments/schema-arch-interop.png new file mode 100644 index 0000000..96275cb Binary files /dev/null and b/doc/toolchain/attachments/schema-arch-interop.png differ diff --git a/doc/toolchain/attachments/schema-arch-overview.png b/doc/toolchain/attachments/schema-arch-overview.png new file mode 100644 index 0000000..f53a746 Binary files /dev/null and b/doc/toolchain/attachments/schema-arch-overview.png differ diff --git a/doc/toolchain/attachments/schema-spoc-builder.png b/doc/toolchain/attachments/schema-spoc-builder.png new file mode 100644 index 0000000..ff64ef4 Binary files /dev/null and b/doc/toolchain/attachments/schema-spoc-builder.png differ diff --git a/doc/toolchain/attachments/schema-spoc-user.png b/doc/toolchain/attachments/schema-spoc-user.png new file mode 100644 index 0000000..c57b042 Binary files /dev/null and b/doc/toolchain/attachments/schema-spoc-user.png differ diff --git a/doc/toolchain/spoc-architecture.rst b/doc/toolchain/spoc-architecture.rst index 0cc0578..4debf0f 100644 --- a/doc/toolchain/spoc-architecture.rst +++ b/doc/toolchain/spoc-architecture.rst @@ -1,6 +1,10 @@ SPOC architecture ================= +.. image:: attachments/schema-arch-interop.png + :alt: Architecture - Services interoperation schema + :align: center + Configuration file ------------------ diff --git a/doc/toolchain/spoc-builder.rst b/doc/toolchain/spoc-builder.rst index 935fb57..7c05bdb 100644 --- a/doc/toolchain/spoc-builder.rst +++ b/doc/toolchain/spoc-builder.rst @@ -1,6 +1,10 @@ SPOC building and packaging ============================= +.. image:: attachments/schema-spoc-builder.png + :alt: Deliverable lifecycle - Building and packaging schema + :align: center + Usage ----- diff --git a/doc/toolchain/spoc-overview.rst b/doc/toolchain/spoc-overview.rst index 8643b87..4f8fee5 100644 --- a/doc/toolchain/spoc-overview.rst +++ b/doc/toolchain/spoc-overview.rst @@ -5,6 +5,10 @@ SPOC is the main component of the platform. It provides means for the layers, im SPOC is written in python 3.7 and uses LXC as a userspace interface for the Linux kernel containment features. SPOC consists of a python module, configuration file, init task and three main binaries to work with the respective deliverable types. +.. image:: attachments/schema-arch-overview.png + :alt: Architecture - Platform overview schema + :align: center + Goals and non-goals ------------------- @@ -37,7 +41,7 @@ Finally, Docker maintainers explicitly refuse to implement a feature which would The downside of using LXC is that its usage requires more knowledge about how the linux containers actually work. Another problem is fast availability of the desired image as most 3rd party applications are shipped with `Dockerfile` or directly distributed as Docker images. SPOC/LXC requires rewriting into LXC-compatible containers, however this is simplified by SPOC as the `image building `_ aims to mimic the features of Docker and automatize LXC container building using *Dockerfile*-like syntax. -In the future, LXC and part of SPOC may be replaced by Podman and Podman-compose to reach even wider audience. +In the future, LXC and part of SPOC may be replaced by Podman and Podman-compose, Vagrant or even Ansible to reach even wider audience. Package manager --------------- diff --git a/doc/toolchain/spoc-user.rst b/doc/toolchain/spoc-user.rst index 9a526cd..b4a1a31 100644 --- a/doc/toolchain/spoc-user.rst +++ b/doc/toolchain/spoc-user.rst @@ -1,6 +1,10 @@ SPOC user manual ================== +.. image:: attachments/schema-spoc-user.png + :alt: Deliverable lifecycle - User consumption schema + :align: center + Usage -----