changeset 33:72017b43cd47

upgrade to VolView 4.4.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 23 Sep 2025 11:20:16 +0200
parents dc414f2bbea0
children 935c02235c49
files CMakeLists.txt NEWS Resources/CreateVolViewDist.sh Resources/CreateVolViewDist/Dockerfile
diffstat 4 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Sep 23 10:50:12 2025 +0200
+++ b/CMakeLists.txt	Tue Sep 23 11:20:16 2025 +0200
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.5")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.9")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/NEWS	Tue Sep 23 10:50:12 2025 +0200
+++ b/NEWS	Tue Sep 23 11:20:16 2025 +0200
@@ -1,8 +1,7 @@
 Pending changes in the mainline
 ===============================
 
-* Upgrade to VolView mainline (commit 971610f).
-  Note that the VolView "About" box shall now display version 4.3.0.
+* Upgrade to VolView 4.4.0
 
 
 Version 1.2 (2025-01-17)
--- a/Resources/CreateVolViewDist.sh	Tue Sep 23 10:50:12 2025 +0200
+++ b/Resources/CreateVolViewDist.sh	Tue Sep 23 11:20:16 2025 +0200
@@ -25,11 +25,11 @@
 # folder of VolView. It uses Docker to this end, in order to be usable
 # on our CIS.
 
-set -ex
+set -e
 
 if [ "$1" = "" ]; then
-    #VERSION=4.3.0
-    VERSION=main-971610f
+    VERSION=4.4.0
+    EXPECTED_MD5="88f6bef9a4ccb637d1db863b378462f1"
 else
     VERSION=$1
 fi
@@ -54,10 +54,16 @@
           wget https://orthanc.uclouvain.be/downloads/third-party-downloads/VolView-${VERSION}.tar.gz )
 fi
 
+ACTUAL_MD5=`md5sum "${ROOT_DIR}/VolView/VolView-${VERSION}.tar.gz" | cut -d ' ' -f1`
+if [ "${EXPECTED_MD5}" != "" -a "${ACTUAL_MD5}" != "${EXPECTED_MD5}" ]; then
+    echo "Bad hash for file: ${ROOT_DIR}/VolView/VolView-${VERSION}.tar.gz"
+    exit -1
+fi
+
 mkdir -p ${ROOT_DIR}/VolView/dist/
 
 ( cd ${ROOT_DIR}/Resources/CreateVolViewDist && \
-      docker build --no-cache -t ${IMAGE} . )
+      docker build --network=host --no-cache -t ${IMAGE} . )
 
 docker run -t ${DOCKER_FLAGS} --rm \
        --user $(id -u):$(id -g) \
--- a/Resources/CreateVolViewDist/Dockerfile	Tue Sep 23 10:50:12 2025 +0200
+++ b/Resources/CreateVolViewDist/Dockerfile	Tue Sep 23 11:20:16 2025 +0200
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-FROM node:19.7.0-bullseye-slim
+FROM node:24-trixie-slim
 
 MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
 LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"