Merge branch 'master' into bookworm

README-dockerhub.md

@@ -23,7 +23,7 @@ Release notes are available [here](https://github.com/orthanc-server/orthanc-bui
 
 # packages content
 
-#### 23.8.1 Default image
+#### 23.11.0 Default image
 ```
 component                             version
 ---------------------------------------------
@@ -36,29 +36,29 @@ Delayed Deletion plugin               1.12.1
 Multitenant DICOM plugin              1.12.1
 Stone Web viewer plugin               2.5+4087511e8eef
 Osimis Web viewer plugin              1.4.2
-Python plugin                         4.0
+Python plugin                         4.1
 Orthanc Web viewer plugin             2.8
 DICOMweb plugin                       1.15
 PostgreSQL plugins                    5.1
 MySQL plugins                         5.1
 WSI Web viewer plugin                 2.0
-Authorization plugin                  0.5.3
+Authorization plugin                  0.6.1
 Transfers accelerator plugin          1.4
 GDCM plugin                           1.5
 ODBC plugin                           1.1
 TCIA plugin                           1.1
 Orthanc Indexer plugin                1.0
 Orthanc neuroimaging plugin           1.0
-AWS S3 plugin                         2.2.0
-Orthanc Explorer 2                    1.1.0
+AWS S3 plugin                         2.3.0
+Orthanc Explorer 2                    1.1.3
 Kitware's VolView plugin              1.1
 OHIF plugin                           1.0
 ```
 
-#### 23.8.0-full image 
+#### 23.11.0-full image 
 ```
 additional component                  version
 ---------------------------------------------
-Azure Blob Storage plugin             2.2.0
-Google Cloud Storage plugin           2.2.0
+Azure Blob Storage plugin             2.3.0
+Google Cloud Storage plugin           2.3.0
 ````

WindowsInstaller/NOTES.txt

@@ -76,7 +76,7 @@ packages:
 # wget https://anonscm.debian.org/cgit/debian-med/orthanc.git/plain/debian/configuration/worklists.json -O Resources/worklists.json
 # unix2dos Resources/worklists.json
 
-# wget https://hg.orthanc-server.com/orthanc-stone/raw-file/StoneWebViewer-2.3/Applications/StoneWebViewer/WebApplication/configuration.json -O Resources/stone-webviewer.json
+# wget https://orthanc.uclouvain.be/hg/orthanc-stone/raw-file/StoneWebViewer-2.3/Applications/StoneWebViewer/WebApplication/configuration.json -O Resources/stone-webviewer.json
 # unix2dos Resources/stone-webviewer.json
 
 

WindowsInstaller/Resources/README.txt

@@ -15,7 +15,7 @@ http://127.0.0.1:8042/app/explorer.html. Please remember that Orthanc
 Explorer does not support Microsoft Internet Explorer.
 
 
-Content of the package 23.8.1
+Content of the package 23.11.0
 ------------------------------
 
 Orthanc server                        1.12.1
@@ -33,17 +33,17 @@ PostgreSQL plugins                    5.1
 MySQL plugins                         5.1
 WSI Web viewer plugin                 2.0
 Transfers accelerator plugin          1.4
-Authorization plugin                  0.5.3
+Authorization plugin                  0.6.1
 GDCM decoder/transcoder plugin        1.5
 ODBC plugin                           1.1
 TCIA plugin                           1.1
 Orthanc Indexer plugin                1.0
 Orthanc neuroimaging plugin           1.0
-Orthanc Explorer 2                    1.1.0
-Azure blob storage plugin             2.2.0          (Win64 installers only !)
+Orthanc Explorer 2                    1.1.3
+Azure blob storage plugin             2.3.0          (Win64 installers only !)
 Kitware's VolView plugin              1.1
 OHIF plugin                           1.0
-
+Python plugin                         4.1
 
 Folders
 -------

docker/integration-tests/docker-compose.s3.yml

@@ -1,10 +1,12 @@
-version: "2"
+version: "3"
 services:
   orthanc-under-tests:
     image: orthanc-under-tests
     depends_on:
-      - minio
-      - createbuckets
+      minio:
+        condition: service_healthy
+      createbuckets:
+        condition: service_healthy
     environment:
       ORTHANC__AWS_S3_STORAGE__BUCKET_NAME: "my-sample-bucket"
       ORTHANC__AWS_S3_STORAGE__REGION: "eu-west-1"
@@ -17,7 +19,8 @@ services:
   orthanc-tests:
     image: orthanc-tests
     depends_on:
-      - orthanc-under-tests
+      orthanc-under-tests:
+        condition: service_started
 
   minio:
     command: server /data --console-address ":9001"
@@ -27,15 +30,27 @@ services:
       MINIO_REGION: "eu-west-1"
       MINIO_ROOT_USER: "minio"
       MINIO_ROOT_PASSWORD: "miniopwd"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 2s
+      timeout: 1s
+      retries: 3
 
   createbuckets:
     image: minio/mc:RELEASE.2022-03-17T20-25-06Z
     depends_on:
-      - minio
+      minio:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "cat", "/tmp/initialized"]
+      interval: 2s
+      timeout: 1s
+      retries: 10
     entrypoint: >
       /bin/sh -c "
       /usr/bin/mc alias set myminio http://minio:9000 minio miniopwd;
       /usr/bin/mc mb myminio/my-sample-bucket;
       /usr/bin/mc policy set public myminio/my-sample-bucket;
-      sleep 600
+      touch /tmp/initialized;
+      sleep 600; #otherwise the docker-compose exits once this container has completed !!!
       "

docker/integration-tests/orthanc-tests/Dockerfile

@@ -7,7 +7,7 @@ RUN	DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install mercurial
 WORKDIR /
 
 ARG ORTHANC_TESTS_REVISION=default
-RUN hg clone https://hg.orthanc-server.com/orthanc-tests/ -r $ORTHANC_TESTS_REVISION
+RUN hg clone https://orthanc.uclouvain.be/hg/orthanc-tests/ -r $ORTHANC_TESTS_REVISION
 
 ##############################################################
 FROM jodogne/orthanc-tests as orthanc-tests

docker/integration-tests/orthanc-transcoding-tests/Dockerfile

@@ -10,6 +10,6 @@ RUN pip install pillow
 WORKDIR /
 
 ARG ORTHANC_TESTS_REVISION=default
-RUN hg clone https://hg.orthanc-server.com/orthanc-tests/ -r $ORTHANC_TESTS_REVISION
+RUN hg clone https://orthanc.uclouvain.be/hg/orthanc-tests/ -r $ORTHANC_TESTS_REVISION
 
 ENTRYPOINT python3 /orthanc-tests/Tests/CheckIngestTranscoding.py /usr/local/bin/Orthanc

docker/integration-tests/run-integration-tests.sh

@@ -38,15 +38,15 @@ else
     integ_tests_branch_tag=$(getIntegTestsRevision $version)
 fi
 
-orthanc_tests_revision=$(getHgCommitId https://hg.orthanc-server.com/orthanc-tests/ $integ_tests_branch_tag)
+orthanc_tests_revision=$(getHgCommitId https://orthanc.uclouvain.be/hg/orthanc-tests/ $integ_tests_branch_tag)
 
 popd  # back to docker/integration-tests folder
 
 
 ############ run NewTests first
 testRepoFolder=orthanc-tests-repo-$image
 rm -rf $testRepoFolder/
-hg clone https://hg.orthanc-server.com/orthanc-tests/ -r $orthanc_tests_revision $testRepoFolder
+hg clone https://orthanc.uclouvain.be/hg/orthanc-tests/ -r $orthanc_tests_revision $testRepoFolder
 
 pushd $testRepoFolder/NewTests
 
@@ -93,6 +93,10 @@ python3 -u main.py --pattern=StorageCompression.* \
                    --orthanc_under_tests_docker_image=orthanc-under-tests \
                    --orthanc_under_tests_http_port=8043
 
+python3 -u main.py --pattern=Authorization.* \
+                   --orthanc_under_tests_docker_image=orthanc-under-tests \
+                   --orthanc_under_tests_http_port=8043
+
 popd
 ############ end run NewTests
 

docker/orthanc/Dockerfile

@@ -230,7 +230,7 @@ FROM orthanc-builder-base as build-plugin-ohif
 
 ARG ORTHANC_OHIF_COMMIT_ID
 # CHANGE_VERSION_OHIF check version in https://orthanc.uclouvain.be/hg/orthanc-ohif/file/tip/Resources/CreateOHIFDist.sh
-ARG OHIF_VERSION=3.6.0
+ARG OHIF_VERSION=3.7.0
 RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc-ohif commitId=$ORTHANC_OHIF_COMMIT_ID extraArg1=$OHIF_VERSION baseImage=$PLATFORM/$BASE_IMAGE_TAG preferDownloads=$PREFER_DOWNLOADS enableUploads=$ENABLE_UPLOAD
 
 ########################## Orthanc downloads (since wget is not in the runner image)