Mercurial > hg > orthanc-book
changeset 1102:4f3709b36f8a
clarifying docker
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 16 Aug 2024 10:50:55 +0200 |
parents | 62951fa88d41 |
children | 0f1d221a4faf |
files | Sphinx/source/users/docker-orthancteam.rst Sphinx/source/users/docker.rst |
diffstat | 2 files changed, 24 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/Sphinx/source/users/docker-orthancteam.rst Tue Aug 06 09:48:51 2024 +0200 +++ b/Sphinx/source/users/docker-orthancteam.rst Fri Aug 16 10:50:55 2024 +0200 @@ -49,6 +49,9 @@ - classical configuration files - a mix of these options +A comparison against the ``jodogne/orthanc`` Docker images :ref:`is +available <docker-jodogne-vs-orthanc-team>`. + This `repository <https://github.com/orthanc-server/orthanc-setup-samples/src>`__ contains lots of examples on how to use these images. In particular, `this example <https://github.com/orthanc-server/orthanc-setup-samples/tree/master/docker/all-usages/docker-compose.yml>`__
--- a/Sphinx/source/users/docker.rst Tue Aug 06 09:48:51 2024 +0200 +++ b/Sphinx/source/users/docker.rst Fri Aug 16 10:50:55 2024 +0200 @@ -24,7 +24,13 @@ source code of the corresponding Docker images is available on `GitHub <https://github.com/jodogne/OrthancDocker>`__. -**Note about Orthanc vs. Orthanc Team Docker images:** + +.. _docker-jodogne-vs-orthanc-team: + +Orthanc vs. Orthanc Team Docker images +-------------------------------------- + +Two different flavors of Docker images for Orthanc are available: * The ``jodogne/orthanc`` and ``jodogne/orthanc-plugins`` Docker images that are described on this page are always kept in sync with @@ -33,20 +39,23 @@ (i.e., manual edition of the configuration files). This is also where the new experimental features from `Sébastien Jodogne's research team at UCLouvain <https://orthanc.uclouvain.be/>`__ are - initially released. These images are most useful to **software - developers and researchers**. + initially released. The binaries used in these images correspond to + the Linux Standard Base binaries. The default user interface is the + built-in **Orthanc Explorer**. These images are most useful to + **software developers and researchers**. * Our commercial partner `Orthanc Team <https://orthanc.team/>`__ also - `publishes separated Docker images + `publishes separate Docker images <https://hub.docker.com/r/orthancteam/orthanc>`__. These - ``orthancteam/orthanc`` images are used by the technical team of - the Orthanc Team company in order to provide professional support - to their customers, with a - configuration system that can be tuned through **environment - variables** (which is very handy if using ``docker-compose`` or - Kubernetes). A :ref:`specific page <docker-orthancteam>` is - available to describe how these images should be used. These images - are targeted at **ops teams**. + ``orthancteam/orthanc`` images are used by the technical team of the + Orthanc Team company in order to provide professional support to + their customers, with a configuration system that can be tuned using + **environment variables** (which is very handy if using Docker + Compose or Kubernetes). The binaries used in these images are + compiled from scratch. The default user interface is the **Orthanc + Explorer 2** :ref:`plugin <orthanc-explorer-2>`. A :ref:`specific + page <docker-orthancteam>` is available to describe how these images + should be used. These images are targeted at **ops teams**. **Note for CentOS users:** The Docker environment might be difficult to configure on your platform. Hints are available on the `Orthanc Users