# HG changeset patch # User Alain Mazy # Date 1704362189 -3600 # Node ID 84032b16e616ede016c2a59a6534f73099c94dbc # Parent 62ac15a772f8849027052d13a5e6a33ae218f63f# Parent b7835da597505a7d327b0aaec15eb430b8f52764 merge diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/developers/repositories.rst --- a/Sphinx/source/developers/repositories.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/developers/repositories.rst Thu Jan 04 10:56:29 2024 +0100 @@ -162,7 +162,7 @@ * Your code **must follow the C++03 standard** (C++11 is not accepted for maximum cross-platform compatibility on older platforms). -* The continuous integration servers of Osimis check that Orthanc +* The continuous integration servers at UCLouvain check that Orthanc properly compiles on Ubuntu 16.04, on `Linux Standard Base systems `__ using the `LSB SDB 5.0.0 diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/faq/crash.rst --- a/Sphinx/source/faq/crash.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/faq/crash.rst Thu Jan 04 10:56:29 2024 +0100 @@ -55,52 +55,58 @@ .. highlight:: bash -The Orthanc project provides precompiled debug binaries that can be -run on almost any recent GNU/Linux system (generated thanks to the -`LSB - Linux Standard Base SDK +The Orthanc project provides precompiled binaries with debug symbols +for the mainline that can run on almost any recent GNU/Linux system +(generated thanks to the `LSB - Linux Standard Base SDK `__). This allows to generate a backtrace (the famous "core dumped" message) that can be analyzed by any developer of Orthanc. Assuming that the :ref:`plugin above ` is available as the ``crash.cpp`` file, here is a sample debug session:: - $ wget https://lsb.orthanc-server.com/orthanc/debug/1.12.2/Orthanc + $ wget https://orthanc.uclouvain.be/downloads/linux-standard-base/orthanc/mainline-debug/Orthanc $ chmod +x ./Orthanc - $ gcc -fPIC -shared ./crash.cpp -I ~/orthanc/Plugins/Include -o crash.so + $ g++ -fPIC -shared ./crash.cpp -I ~/orthanc/OrthancServer/Plugins/Include -o crash.so $ ulimit -c unlimited - $ echo '{ "Plugins" : ["crash.so"] }' > Configuration.json + $ echo '{ "Plugins" : ["./crash.so"] }' > Configuration.json $ rm -f core ; ./Orthanc Configuration.json - W0427 15:43:24.215783 main.cpp:1436] Orthanc version: 1.12.2 - W0427 15:43:24.215910 main.cpp:1279] Performance warning: Non-release build, runtime debug assertions are turned on - W0427 15:43:24.217585 OrthancConfiguration.cpp:61] Reading the configuration from: "Configuration.json" - W0427 15:43:24.254733 main.cpp:700] Loading plugin(s) from: crash.so - W0427 15:43:24.254866 PluginsManager.cpp:269] Registering plugin 'crash' (version 0.0) + W0103 18:05:01.661466 MAIN main.cpp:2041] Orthanc version: mainline (20240103T170440) + W0103 18:05:01.661583 MAIN main.cpp:1775] Performance warning: Non-release build, runtime debug assertions are turned on + W0103 18:05:01.661800 MAIN OrthancConfiguration.cpp:57] Reading the configuration from: "Configuration.json" + W0103 18:05:01.864783 MAIN main.cpp:912] Loading plugin(s) from: ./crash.so + W0103 18:05:01.864883 MAIN PluginsManager.cpp:261] Registering plugin 'crash' (version 0.0) Segmentation fault (core dumped) .. highlight:: text This session creates a file called ``core`` in the current working -directory. You can analyze it by running ``gdb`` as follows:: +directory. If you don't see this file, it probably means that your +GNU/Linux distribution customizes the name of core files (this is for +instance the case of Ubuntu 22.04 that sends core files to +``apport``). You can temporarily disable this behavior by typing:: - $ gdb -c ./core ./Orthanc + $ echo core | sudo tee /proc/sys/kernel/core_pattern + + +You can then analyze the ``core`` file by running ``gdb`` as follows:: + + $ gdb -c ./core.424217 ./Orthanc (gdb) bt - #0 0x00007f7b1aa3d739 in OrthancPluginInitialize () from crash.so - #1 0x00000000008632f0 in Orthanc::CallInitialize (plugin=..., context=...) - at /home/jodogne/BuildBotWorker/Orthanc_1_5_6_-_LSB_Debug/build/Plugins/Engine/PluginsManager.cpp:98 - #2 0x0000000000864496 in Orthanc::PluginsManager::RegisterPlugin (this=0x4314f90, path="crash.so") - at /home/jodogne/BuildBotWorker/Orthanc_1_5_6_-_LSB_Debug/build/Plugins/Engine/PluginsManager.cpp:272 - ... + #0 0x00007f5943308111 in OrthancPluginInitialize () from ./crash.so + #1 0x00000000005e1cbc in Orthanc::CallInitialize (plugin=..., context=...) + at /home/jodogne/BuildBotWorker/Orthanc_mainline_-_LSB_Debug/build/OrthancServer/Plugins/Engine/PluginsManager.cpp:87 + #2 0x00000000005e2f14 in Orthanc::PluginsManager::RegisterPlugin (this=0x2edc220, path="./crash.so") + at /home/jodogne/BuildBotWorker/Orthanc_mainline_-_LSB_Debug/build/OrthancServer/Plugins/Engine/PluginsManager.cpp:264 If you are unable to analyze such a backtrace by yourself, feel free to post your ``core`` file on the `Orthanc Users discussion forum -`__. +`__. Do not forget to indicate +the content of +``__ +so that we can find the version of Orthanc that generated the core +file. + **Important:** The Orthanc developers will only be able to analyze the ``core`` files generated by our own precompiled binaries! - - -Docker ------- - -To be written. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/faq/debugging.rst --- a/Sphinx/source/faq/debugging.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/faq/debugging.rst Thu Jan 04 10:56:29 2024 +0100 @@ -30,7 +30,7 @@ setting ``-DCMAKE_BUILD_TYPE=Debug`` when invoking CMake. Then, learn how to use the debugger that is best suited to your -platform (e.g. Microsoft Visual Studio, gdb or Xcode). +platform (e.g. Microsoft Visual Studio, gdb, cgdb, or Xcode). GNU/Linux system using gdb @@ -38,45 +38,65 @@ .. highlight:: bash -The Orthanc project provides precompiled debug binaries that can be -run on almost any recent GNU/Linux system (generated thanks to the -`LSB - Linux Standard Base SDK +The Orthanc project provides precompiled binaries with debug symbols +for the mainline that can run on almost any recent GNU/Linux system +(generated thanks to the `LSB - Linux Standard Base SDK `__). This allows to debug Orthanc without compiling from sources. Here is a sample -debug session:: +debug session to analyze an error that comes from an invalid +:ref:`configuration file `:: - $ wget https://lsb.orthanc-server.com/orthanc/debug/1.12.2/Orthanc + $ wget https://orthanc.uclouvain.be/downloads/linux-standard-base/orthanc/mainline-debug/Orthanc + $ echo 'nope' > invalid.json $ chmod +x ./Orthanc - $ gdb ./Orthanc Configuration.json + $ gdb --args ./Orthanc invalid.json (gdb) catch throw Catchpoint 1 (throw) (gdb) run - W0513 15:24:42.374349 main.cpp:1436] Orthanc version: 1.12.2 - ---> Reproduce your error case <--- - Thread 15 "Orthanc" hit Catchpoint 1 (exception thrown), 0x00007ffff6de68bd in __cxa_throw () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 + Starting program: /tmp/i/Orthanc invalid.json + [Thread debugging using libthread_db enabled] + Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". + W0103 18:25:01.540600 MAIN main.cpp:2041] Orthanc version: mainline (20240103T170440) + W0103 18:25:01.540636 MAIN main.cpp:1775] Performance warning: Non-release build, runtime debug assertions are turned on + W0103 18:25:01.540702 MAIN OrthancConfiguration.cpp:57] Reading the configuration from: "invalid.json" + E0103 18:25:01.540823 MAIN OrthancException.cpp:61] Cannot parse a JSON document: The configuration file does not follow the JSON syntax: invalid.json + + Catchpoint 1 (exception thrown), 0x00007ffff7cae4a1 in __cxa_throw () from /lib/x86_64-linux-gnu/libstdc++.so.6 (gdb) backtrace - #0 0x00007ffff6de68bd in __cxa_throw () - from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 - ... + #0 0x00007ffff7cae4a1 in __cxa_throw () from /lib/x86_64-linux-gnu/libstdc++.so.6 + #1 0x0000000000473745 in Orthanc::AddFileToConfiguration (target=..., path=...) + at /home/jodogne/BuildBotWorker/Orthanc_mainline_-_LSB_Debug/build/OrthancServer/Sources/OrthancConfiguration.cpp:72 + #2 0x0000000000473e98 in Orthanc::ReadConfiguration (target=..., configurationFile=0x7fffffffe302 "invalid.json") + at /home/jodogne/BuildBotWorker/Orthanc_mainline_-_LSB_Debug/build/OrthancServer/Sources/OrthancConfiguration.cpp:149 + [...] If you are unable to analyze such a backtrace by yourself, feel free to post your backtrace on the `Orthanc Users discussion forum -`__. +`__. Do not forget to indicate +the content of +``__ +so that we can find the version of Orthanc that generated the core +file. -**Plugins:** Besides the Orthanc core, debug binaries of the official -plugins precompiled using the LSB are also available at the following -locations: +If you want to read the source code of the backtrace, it is highly +suggested to use ``cgdb`` with its ``set substitute-path`` command. +First read the content of the `revision.txt file +`__ +to identify the revision of Orthanc. Then, you can type:: -* `Orthanc core `__ -* `DICOMweb plugin `__ -* `MySQL plugin `__ -* `Orthanc Web viewer `__ -* `PostgreSQL plugin `__ -* `Transfers accelerator plugin `__ -* `Whole-slide imaging `__ + $ hg clone -r 723251b2b71e https://orthanc.uclouvain.be/hg/orthanc/ + $ cgdb --args ./Orthanc invalid.json + (gdb) set substitute-path /home/jodogne/BuildBotWorker/Orthanc_mainline_-_LSB_Debug/build/ ./orthanc/ + (gdb) catch throw + (gdb) run + (gdb) frame 2 + +Plugins +....... -Docker ------- +Besides the Orthanc core, debug LSB binaries are also available for +most official plugins at the following location: +``__ -To be written. +These binaries are identified as ``mainline-debug/``. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/faq/log.rst --- a/Sphinx/source/faq/log.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/faq/log.rst Thu Jan 04 10:56:29 2024 +0100 @@ -41,10 +41,10 @@ to logging. Check out the :ref:`full manpage `. However, if you use packaged versions of Orthanc that starts the -server in background (such as GNU/Linux packages or the Windows -installers by Osimis), you will have to manually start Orthanc. The -sections below explain how to achieve this goal with the officially -supported packages. +server in background (such as GNU/Linux packages or the `Windows +installers `__), +you will have to manually start Orthanc. The sections below explain +how to achieve this goal with the officially supported packages. With Orthanc Explorer 2 installed @@ -66,7 +66,8 @@ ^^^^^^^^^^^^^ -if you used the official installer by Osimis: +if you used the `official Windows installers +`__: 1. Stop the Orthanc service. The actual process depends on your version of Windows. @@ -177,4 +178,4 @@ * Starting from Orthanc 1.12.2, Orthanc is logging the thread name in the logs. If you need to revert back to the previous format, add the - ``--logs-no-thread`` command line option at startup. \ No newline at end of file + ``--logs-no-thread`` command line option at startup. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/faq/scalability.rst --- a/Sphinx/source/faq/scalability.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/faq/scalability.rst Thu Jan 04 10:56:29 2024 +0100 @@ -63,8 +63,10 @@ * Make sure that :ref:`run-time debug assertions ` are turned off. A warning will show in the logs if this is not the - case. Note that all pre-built binaries provided by Osimis are - correctly configured in that respect. + case. Note that all `pre-compiled binaries + `__ provided by + the Orthanc project are correctly configured in that respect, except + if they are explicitly tagged as "debug". * We suggest to use the default filesystem storage area. Of course, make sure that the filesystem is properly backed up, and that @@ -337,6 +339,10 @@ the ``/jobs`` route will return only the jobs of the responding Orthanc. + - Similarly, each Orthanc instance maintains its own :ref:`status + for the resources it has received `. Thus, the + ``IsStable`` information is local to each Orthanc instance. + - The ``/modalities`` or the ``/peers`` are also private to each instance of Orthanc in the cluster, as soon as the respective options ``DicomModalitiesInDatabase`` and @@ -345,11 +351,11 @@ If you need to use such primitives in your application, you have three possibilities: (1) Introduce a distinguished Orthanc server that is responsible to take care of all the jobs (including - modalities and peers), (2) create an :ref:`Orthanc plugin ` - (e.g. using :ref:`Python ` or :ref:`Java - `) that queries all the Orthanc in the cluster and that - aggregates all of their answers, or (3) do the same using a - higher-level framework (such as Node.js). + modalities and peers) and/or to receive all the DICOM instances, (2) + create an :ref:`Orthanc plugin ` (e.g. using :ref:`Python + ` or :ref:`Java `) that queries all the + Orthanc in the cluster and that aggregates all of their answers, + or (3) do the same using a higher-level framework (such as Node.js). Latency diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/faq/troubleshooting.rst --- a/Sphinx/source/faq/troubleshooting.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/faq/troubleshooting.rst Thu Jan 04 10:56:29 2024 +0100 @@ -199,14 +199,14 @@ elsewhere on Internet). * If **Orthanc crashes when handling one large DICOM file**, this most - probably indicates a memory allocation error. Indeed, the `official - Windows binaries - `__ are compiled - using a 32bit compiler. As a consequence, Orthanc only has access to - less than 4GB of RAM. If this is an important limitation for you, - precompiled command-line versions of Orthanc for Windows 64bit are - available courtesy of `Osimis - `__. + probably indicates a memory allocation error. Indeed, some + precompiled `official Windows binaries + `__ + are compiled using a 32bit compiler. As a consequence, Orthanc only + has access to less than 4GB of RAM. If this is an important + limitation for you, precompiled command-line versions of Orthanc for + Windows 64bit are `also available + `__. * Avoid installing Orthanc, its database or its storage area in folders whose names contain **spaces or special characters**. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/plugins/authorization.rst --- a/Sphinx/source/plugins/authorization.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/plugins/authorization.rst Thu Jan 04 10:56:29 2024 +0100 @@ -6,12 +6,17 @@ .. contents:: -This **official plugin by Osimis** extends Orthanc with an advanced +This **official plugin** extends Orthanc with an advanced authorization mechanism. For each incoming REST request to some URI, the plugin will query a Web service to know whether the access is granted to the user. If access is not granted, the HTTP status code is set to ``403`` (Forbidden). +**Status:** This plugin was `deprecated +`__ +between 2020 and 2022, but its active development has been resumed +since May 2022. + How to get it ? --------------- @@ -398,12 +403,13 @@ Integration with the Orthanc Explorer ------------------------------------- -Starting from Orthanc 1.5.8, you can pass authorization tokens in the url -search params when opening the Orthanc explorer i.e. -http://localhost:8042/app/explorer.html?token=1234. This token will be -included as an HTTP header in every request sent to the Orthanc Rest API. -It will also be included in the url search params when opening the Orthanc -or Osimis viewer. +Starting from Orthanc 1.5.8, you can pass authorization tokens in the +url search params when opening the Orthanc explorer, i.e. +``http://localhost:8042/app/explorer.html?token=1234``. This token +will be included as an HTTP header in every request sent to the +Orthanc Rest API. It will also be included in the URL search params +when opening the Orthanc or :ref:`Osimis Web viewer +`. Only 3 tokens name will be recognized and forwarded: ``token``, ``auth-token`` and ``authorization``. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/plugins/odbc.rst --- a/Sphinx/source/plugins/odbc.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/plugins/odbc.rst Thu Jan 04 10:56:29 2024 +0100 @@ -138,10 +138,9 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Pre-compiled binaries for Microsoft Windows 32bit `are also available -`__. A -package for `Apple's Mac OS X -`__ is available courtesy of -`Osimis `__. +`__, +as well as for `Apple macOS +`__. .. _odbc-ubuntu1604: diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/plugins/transfers.rst --- a/Sphinx/source/plugins/transfers.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/plugins/transfers.rst Thu Jan 04 10:56:29 2024 +0100 @@ -6,7 +6,7 @@ .. contents:: -Osimis provides a `transfers accelerator plugin +The Orthanc project provides a `transfers accelerator plugin `__ whose purpose is to speed up the transfers of DICOM instances over networks (with respect to the native DICOM protocol or to the built-in diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/plugins/worklists-plugin.rst --- a/Sphinx/source/plugins/worklists-plugin.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/plugins/worklists-plugin.rst Thu Jan 04 10:56:29 2024 +0100 @@ -92,7 +92,7 @@ for Microsoft Windows):: "Plugins" : [ - "OsimisWebViewer.dll", + "StoneWebViewer.dll", "ModalityWorklists.dll" // On GNU/Linux, use libModalityWorklists.so ], diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/users/configuration.rst --- a/Sphinx/source/users/configuration.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/users/configuration.rst Thu Jan 04 10:56:29 2024 +0100 @@ -55,15 +55,16 @@ backslashes (i.e. ``\``) should be either escaped by doubling them (as in ``\\``), or replaced by forward slashes (as in ``/``). -**Remark 2:** When installing Orthanc using the Windows installer by -Osimis, you won't be able to edit your files unless you start your -editor with ``Run as administrator``. We recommend to edit your -configuration file with an editor such as `Notepad++ -`_. It shall warn you that this file -can be edited only by an admin, and will suggest you to restart -Notepad++ as an admin such that you'll be able to save it. +**Remark 2:** When installing Orthanc using the `official Windows +installers `__, +you won't be able to edit your files unless you start your editor with +``Run as administrator``. We recommend to edit your configuration file +with an editor such as `Notepad++ `_. +It shall warn you that this file can be edited only by an admin, and +will suggest you to restart Notepad++ as an admin such that you'll be +able to save it. -**Remark 3:** The Windows installers by Osimis provide a `Windows +**Remark 3:** The official Windows installers include a `Windows service `__ that automatically starts Orthanc during the startup of Microsoft Windows. You can control the parameters of the service by typing diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/users/docker.rst --- a/Sphinx/source/users/docker.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/users/docker.rst Thu Jan 04 10:56:29 2024 +0100 @@ -75,13 +75,13 @@ If more stability is required, you can select the official release of Orthanc to be run:: - $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.12.2 Passing additional command-line options (e.g. to make Orthanc verbose) can be done as follows (note the ``/etc/orthanc`` option that is required for Orthanc to find its configuration files):: - $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.12.1 /etc/orthanc --verbose + $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc:1.12.2 /etc/orthanc --verbose Usage, with plugins enabled @@ -97,7 +97,7 @@ Or you can also start a specific version of Orthanc for more stability:: - $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc-plugins:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc-plugins:1.12.2 If you have an interest in the :ref:`Python plugin `, you can use the ``orthanc-python`` image. The latter image is a @@ -105,7 +105,7 @@ Python 3.7 interpreter. Here is how to start this image:: $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc-python - $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc-python:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm jodogne/orthanc-python:1.12.2 Fine-tuning the configuration @@ -119,12 +119,12 @@ You can generate a custom configuration file for Orthanc as follows:: - $ docker run --rm --entrypoint=cat jodogne/orthanc:1.12.1 /etc/orthanc/orthanc.json > /tmp/orthanc.json + $ docker run --rm --entrypoint=cat jodogne/orthanc:1.12.2 /etc/orthanc/orthanc.json > /tmp/orthanc.json Then, edit the just-generated file ``/tmp/orthanc.json`` and restart Orthanc with your updated configuration:: - $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc.json:/etc/orthanc/orthanc.json:ro jodogne/orthanc:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc.json:/etc/orthanc/orthanc.json:ro jodogne/orthanc:1.12.2 *Remark:* These Docker images automatically set the environment variable ``MALLOC_ARENA_MAX`` to ``5`` in order to :ref:`control @@ -157,7 +157,7 @@ version: '3.1' # Secrets are only available since this version of Docker Compose services: orthanc: - image: jodogne/orthanc-plugins:1.12.1 + image: jodogne/orthanc-plugins:1.12.2 command: /run/secrets/ # Path to the configuration files (stored as secrets) ports: - 4242:4242 @@ -206,7 +206,7 @@ container to some path in the filesystem of your Linux host, e.g.:: $ mkdir /tmp/orthanc-db - $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc-db/:/var/lib/orthanc/db/ jodogne/orthanc:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc-db/:/var/lib/orthanc/db/ jodogne/orthanc:1.12.2 Whole-slide imaging support @@ -216,13 +216,13 @@ whole-slide imaging (WSI) `. For instance, the following command will start the WSI viewer plugin transparently together with Orthanc:: - $ docker run -p 4242:4242 -p 8042:8042 --rm --name orthanc-wsi jodogne/orthanc-plugins:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm --name orthanc-wsi jodogne/orthanc-plugins:1.12.2 Note that we gave the name ``orthanc-wsi`` to this new Docker container. Then, the Dicomizer command-line tool can be invoked as follows:: - $ docker run -t -i --rm --link=orthanc-wsi:orthanc --entrypoint=OrthancWSIDicomizer -v /tmp/Source.tif:/tmp/Source.tif:ro jodogne/orthanc-plugins:1.12.1 --username=orthanc --password=orthanc --orthanc=http://orthanc:8042/ /tmp/Source.tif + $ docker run -t -i --rm --link=orthanc-wsi:orthanc --entrypoint=OrthancWSIDicomizer -v /tmp/Source.tif:/tmp/Source.tif:ro jodogne/orthanc-plugins:1.12.2 --username=orthanc --password=orthanc --orthanc=http://orthanc:8042/ /tmp/Source.tif This command needs a few explanations: @@ -250,7 +250,7 @@ instruct the Dicomizer to use `OpenSlide `__ to decode it by adding the ``--openslide`` option:: - $ docker run -t -i --rm --link=orthanc-wsi:orthanc --entrypoint=OrthancWSIDicomizer -v /tmp/Source.svs:/tmp/Source.svs:ro jodogne/orthanc-plugins:1.12.1 --username=orthanc --password=orthanc --orthanc=http://orthanc:8042/ --openslide=libopenslide.so /tmp/Source.svs + $ docker run -t -i --rm --link=orthanc-wsi:orthanc --entrypoint=OrthancWSIDicomizer -v /tmp/Source.svs:/tmp/Source.svs:ro jodogne/orthanc-plugins:1.12.2 --username=orthanc --password=orthanc --orthanc=http://orthanc:8042/ --openslide=libopenslide.so /tmp/Source.svs PostgreSQL and Orthanc inside Docker @@ -271,7 +271,7 @@ $ docker inspect --format '{{ .NetworkSettings.IPAddress }}' some-postgres $ docker inspect --format '{{ .NetworkSettings.Ports }}' some-postgres - $ docker run --rm --entrypoint=cat jodogne/orthanc-plugins:1.12.1 /etc/orthanc/orthanc.json > /tmp/orthanc.json + $ docker run --rm --entrypoint=cat jodogne/orthanc-plugins:1.12.2 /etc/orthanc/orthanc.json > /tmp/orthanc.json .. highlight:: text @@ -292,7 +292,7 @@ Finally, you can start Orthanc:: - $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc.json:/etc/orthanc/orthanc.json:ro jodogne/orthanc-plugins:1.12.1 + $ docker run -p 4242:4242 -p 8042:8042 --rm -v /tmp/orthanc.json:/etc/orthanc/orthanc.json:ro jodogne/orthanc-plugins:1.12.2 Debugging @@ -303,28 +303,5 @@ For debugging purpose, you can start an interactive bash session as follows:: - $ docker run -i -t --rm --entrypoint=bash jodogne/orthanc:1.12.1 - $ docker run -i -t --rm --entrypoint=bash jodogne/orthanc-plugins:1.12.1 - -For developers and power users, the images ``jodogne/orthanc-debug`` -contain the Orthanc core compiled in debug mode (i.e. with runtime -assertions enabled, and including debugging symbols). A ``gdb`` -command-line session can be started as follows:: - - $ docker run -i -t --rm --entrypoint=bash --network=host --cap-add=SYS_PTRACE -p 4242:4242 -p 8042:8042 jodogne/orthanc-debug - # gdb --args Orthanc /etc/orthanc/ --verbose - -Exceptions can be automatically caught by launching ``gdb`` as follows:: - - # gdb --ex 'catch t' --ex r --ex bt --args ./Orthanc /etc/orthanc/ --verbose - -Note that: - -* The plugins are not available in this image yet. - -* The Orthanc source code can be found in folder ``/root/orthanc``. - -* The build artifacts can be found in folder ``/root/orthanc/Build``. - -* This command launches the mainline version. To start a released version, - use e.g. ``jodogne/orthanc-debug:1.12.1``. + $ docker run -i -t --rm --entrypoint=bash jodogne/orthanc:1.12.2 + $ docker run -i -t --rm --entrypoint=bash jodogne/orthanc-plugins:1.12.2 diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/users/docker.rst.BAK --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Sphinx/source/users/docker.rst.BAK Thu Jan 04 10:56:29 2024 +0100 @@ -0,0 +1,23 @@ + +For developers and power users, the images ``jodogne/orthanc-debug`` +contain the Orthanc core compiled in debug mode (i.e. with runtime +assertions enabled, and including debugging symbols). A ``gdb`` +command-line session can be started as follows:: + + $ docker run -i -t --rm --entrypoint=bash --network=host --cap-add=SYS_PTRACE -p 4242:4242 -p 8042:8042 jodogne/orthanc-debug + # gdb --args Orthanc /etc/orthanc/ --verbose + +Exceptions can be automatically caught by launching ``gdb`` as follows:: + + # gdb --ex 'catch t' --ex r --ex bt --args ./Orthanc /etc/orthanc/ --verbose + +Note that: + +* The plugins are not available in this image yet. + +* The Orthanc source code can be found in folder ``/root/orthanc``. + +* The build artifacts can be found in folder ``/root/orthanc/Build``. + +* This command launches the mainline version. To start a released version, + use e.g. ``jodogne/orthanc-debug:1.12.2``. diff -r 62ac15a772f8 -r 84032b16e616 Sphinx/source/users/support.rst --- a/Sphinx/source/users/support.rst Thu Jan 04 10:56:13 2024 +0100 +++ b/Sphinx/source/users/support.rst Thu Jan 04 10:56:29 2024 +0100 @@ -52,8 +52,8 @@ Importantly, for all the features that are pending in the ``TODO`` file, if you are a company, please consider `buying professional -services `__ in order to get -the feature implemented faster. +services `__ in order to get the feature +implemented faster. .. _support-mwe: @@ -112,15 +112,16 @@ support! In addition, please note that the original author of Orthanc -(Sébastien Jodogne), as a free software advocate, will only personally -deal with issues that are reproducible on recent GNU/Linux -distributions (typically, on Ubuntu 18.04 LTS or through Docker). +(`Sébastien Jodogne `__), as a free +software advocate, will only personally deal with issues that are +reproducible on recent GNU/Linux distributions (typically, on Ubuntu +18.04 LTS or through Docker). .. _support-minquality: Required minimal quality of a message in the Orthanc Users discussion forum --------------------------------------------------------- +--------------------------------------------------------------------------- While posting a message on the `Orthanc Users discussion forum `__, you should not be surprised if @@ -166,15 +167,14 @@ 2. If you need an **additional feature implemented in Orthanc**, and if you are ready to pay, get in touch with the `Orthanc Team - `__ or with `Osimis - `__, the commercial partners of - the Orthanc project. + `__, the main commercial partner of the + Orthanc project. 3. If you are part of a **scientific team** and would like to setup a research project using Orthanc, including about AI, get in touch - with `Sébastien Jodogne's research lab - `__ at the UCLouvain - university. + with `Sébastien Jodogne + `__'s research lab at the + `UCLouvain university `__. 4. If you are not able to reproduce an issue by yourself, if you are looking for personalized help related to deployments/training/..., @@ -227,6 +227,6 @@ * `James Manner `__ (English, Australia) Get in touch with `Sébastien Jodogne - `__ if you want to be included - in this list. + `__ if you want to be + included in this list.