From b720675969391c589c74851b080514011c7baad1 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:49:38 -0600 Subject: [PATCH] remove commitId=tip --- docker/orthanc/build-or-download.sh | 2 +- local-build.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/orthanc/build-or-download.sh b/docker/orthanc/build-or-download.sh index a1c305e..411f40d 100755 --- a/docker/orthanc/build-or-download.sh +++ b/docker/orthanc/build-or-download.sh @@ -41,7 +41,7 @@ echo "extraArg1 = $extraArg1" echo "version = $version" # TODO revisit this... always cloning the latest version -commitId=tip +# commitId=tip # while debugging the script on your local machine, you might want to change these paths # buildRootPath=/tmp/build diff --git a/local-build.sh b/local-build.sh index baa5d42..e9e52ce 100755 --- a/local-build.sh +++ b/local-build.sh @@ -69,13 +69,13 @@ ORTHANC_GDCM_COMMIT_ID=$(getCommitId "Orthanc-gdcm" $version docker $skipCommitC ORTHANC_PG_COMMIT_ID=$(getCommitId "Orthanc-postgresql" $version docker $skipCommitChecks $throttle) # ORTHANC_MYSQL_COMMIT_ID=$(getCommitId "Orthanc-mysql" $version docker $skipCommitChecks $throttle) # ORTHANC_TRANSFERS_COMMIT_ID=$(getCommitId "Orthanc-transfers" $version docker $skipCommitChecks $throttle) -# ORTHANC_DW_COMMIT_ID=$(getCommitId "Orthanc-dicomweb" $version docker $skipCommitChecks $throttle) +ORTHANC_DW_COMMIT_ID=$(getCommitId "Orthanc-dicomweb" $version docker $skipCommitChecks $throttle) # ORTHANC_WSI_COMMIT_ID=$(getCommitId "Orthanc-wsi" $version docker $skipCommitChecks $throttle) # ORTHANC_OWV_COMMIT_ID=$(getCommitId "Orthanc-webviewer" $version docker $skipCommitChecks $throttle) ORTHANC_AUTH_COMMIT_ID=$(getCommitId "Orthanc-auth" $version docker $skipCommitChecks $throttle) -# ORTHANC_PYTHON_COMMIT_ID=$(getCommitId "Orthanc-python" $version docker $skipCommitChecks $throttle) +ORTHANC_PYTHON_COMMIT_ID=$(getCommitId "Orthanc-python" $version docker $skipCommitChecks $throttle) # ORTHANC_ODBC_COMMIT_ID=$(getCommitId "Orthanc-odbc" $version docker $skipCommitChecks $throttle) -# ORTHANC_INDEXER_COMMIT_ID=$(getCommitId "Orthanc-indexer" $version docker $skipCommitChecks $throttle) +ORTHANC_INDEXER_COMMIT_ID=$(getCommitId "Orthanc-indexer" $version docker $skipCommitChecks $throttle) # ORTHANC_NEURO_COMMIT_ID=$(getCommitId "Orthanc-neuro" $version docker $skipCommitChecks $throttle) ORTHANC_TCIA_COMMIT_ID=$(getCommitId "Orthanc-tcia" $version docker $skipCommitChecks $throttle) # ORTHANC_STONE_VIEWER_COMMIT_ID=$(getCommitId "Orthanc-stone" $version docker $skipCommitChecks $throttle) @@ -357,7 +357,10 @@ fi --build-arg ORTHANC_COMMIT_ID=$ORTHANC_COMMIT_ID \ --build-arg ORTHANC_GDCM_COMMIT_ID=$ORTHANC_GDCM_COMMIT_ID \ --build-arg ORTHANC_PG_COMMIT_ID=$ORTHANC_PG_COMMIT_ID \ + --build-arg ORTHANC_DW_COMMIT_ID=$ORTHANC_DW_COMMIT_ID \ --build-arg ORTHANC_AUTH_COMMIT_ID=$ORTHANC_AUTH_COMMIT_ID \ + --build-arg ORTHANC_PYTHON_COMMIT_ID=$ORTHANC_PYTHON_COMMIT_ID \ + --build-arg ORTHANC_INDEXER_COMMIT_ID=$ORTHANC_INDEXER_COMMIT_ID \ --build-arg ORTHANC_TCIA_COMMIT_ID=$ORTHANC_TCIA_COMMIT_ID \ --build-arg PLATFORM=$platform \ $from_cache_arg \