Skip to content

Commit

Permalink
pin orthanc to commit b822dcebf9ff
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulineribeyre
paulineribeyre committed Jan 30, 2025
1 parent ad48740 commit b0ecae9
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 30 deletions.
3 changes: 2 additions & 1 deletion docker/orthanc/AmazonLinux2Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ ARG STABLE_OR_UNSTABLE=stable
FROM orthanc-builder-base AS build-orthanc

ARG ORTHANC_COMMIT_ID
RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc commitId=$ORTHANC_COMMIT_ID baseImage=$PLATFORM/$BASE_IMAGE_TAG preferDownloads=$PREFER_DOWNLOADS enableUploads=$ENABLE_UPLOAD
# RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc commitId=$ORTHANC_COMMIT_ID baseImage=$PLATFORM/$BASE_IMAGE_TAG preferDownloads=$PREFER_DOWNLOADS enableUploads=$ENABLE_UPLOAD
RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc commitId=b822dcebf9ff baseImage=$PLATFORM/$BASE_IMAGE_TAG preferDownloads=$PREFER_DOWNLOADS enableUploads=$ENABLE_UPLOAD

######################### Orthanc GDCM

Expand Down
56 changes: 28 additions & 28 deletions docker/orthanc/build-or-download.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if [[ $target == "orthanc" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "result\[VERSION\] = ORTHANC_VERSION" $sourcesRootPath/OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp "result\[VERSION\] = \"mainline-$commitId\""
patch_version_name_on_unstable "return MODALITY_WORKLISTS_VERSION" $sourcesRootPath/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
Expand Down Expand Up @@ -142,7 +142,7 @@ elif [[ $target == "orthanc-authorization" ]]; then

# if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-authorization/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-authorization/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -160,7 +160,7 @@ elif [[ $target == "orthanc-python" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-python/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-python/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/Sources/Plugin.cpp

Expand All @@ -177,7 +177,7 @@ elif [[ $target == "orthanc-gdcm" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-gdcm/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-gdcm/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -196,8 +196,8 @@ elif [[ $target == "orthanc-pg" ]]; then

if [[ $dl != 0 ]]; then

# hg --debug clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath
# hg clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/PostgreSQL/Plugins/IndexPlugin.cpp
patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/PostgreSQL/Plugins/StoragePlugin.cpp
Expand All @@ -218,8 +218,8 @@ elif [[ $target == "orthanc-mysql" ]]; then

if [[ $dl != 0 ]]; then

# hg --debug clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath
# hg clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/MySQL/Plugins/IndexPlugin.cpp
patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/MySQL/Plugins/StoragePlugin.cpp
Expand All @@ -240,8 +240,8 @@ elif [[ $target == "orthanc-odbc" ]]; then

if [[ $dl != 0 ]]; then

# hg --debug clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath
# hg clone https://orthanc.uclouvain.be/hg/orthanc/ -r default /orthanc
hg clone https://orthanc.uclouvain.be/hg/orthanc-databases/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Odbc/Plugins/IndexPlugin.cpp
patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Odbc/Plugins/StoragePlugin.cpp
Expand All @@ -261,7 +261,7 @@ elif [[ $target == "orthanc-indexer" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-indexer/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-indexer/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Sources/Plugin.cpp

Expand All @@ -278,7 +278,7 @@ elif [[ $target == "orthanc-neuro" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-neuro/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-neuro/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Sources/Plugin/Plugin.cpp

Expand All @@ -295,7 +295,7 @@ elif [[ $target == "orthanc-java" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-java/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-java/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -319,7 +319,7 @@ elif [[ $target == "orthanc-stl" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-stl/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-stl/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_STL_VERSION" $sourcesRootPath/Sources/Plugin.cpp

Expand All @@ -342,7 +342,7 @@ elif [[ $target == "orthanc-tcia" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-tcia/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-tcia/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand Down Expand Up @@ -405,7 +405,7 @@ elif [[ $target == "orthanc-volview-from-dist" ]]; then
# build only the C++ code, not the dist.zip that has been downloaded before

pushd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-volview/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-volview/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_VOLVIEW_VERSION" $sourcesRootPath/Sources/Plugin.cpp

Expand All @@ -430,7 +430,7 @@ elif [[ $target == "orthanc-volview" ]]; then
nvm install v19.7.0

pushd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-volview/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-volview/ -r $commitId $sourcesRootPath

volview_version=$(cat $sourcesRootPath/Resources/CreateVolViewDist.sh | grep -oP 'VERSION=\K\d+\.\d+\.\d+')

Expand Down Expand Up @@ -475,7 +475,7 @@ elif [[ $target == "orthanc-ohif-from-dist" ]]; then
# build only the C++ code, not the dist.zip that has been downloaded before

pushd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-ohif/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-ohif/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_OHIF_VERSION" $sourcesRootPath/Sources/Plugin.cpp

Expand All @@ -502,7 +502,7 @@ elif [[ $target == "orthanc-ohif" ]]; then
npm install --global yarn

pushd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-ohif/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-ohif/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_OHIF_VERSION" $sourcesRootPath/Sources/Plugin.cpp
ohif_version=$(cat $sourcesRootPath/Resources/CreateOHIFDist.sh | grep -oP 'PACKAGE=Viewers-\K\d+\.\d+\.\d+')
Expand Down Expand Up @@ -536,7 +536,7 @@ elif [[ $target == "orthanc-s3" ]]; then
export DEBIAN_FRONTEND=noninteractive && apt-get --assume-yes update && apt-get --assume-yes install libcrypto++-dev && apt-get clean && rm -rf /var/lib/apt/lists/*

cd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId
hg clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId
ln -s /third-party-downloads $sourcesRootPath/orthanc-object-storage/Aws/ThirdPartyDownloads

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/orthanc-object-storage/Common/StoragePlugin.cpp
Expand All @@ -558,7 +558,7 @@ elif [[ $target == "orthanc-google-storage" ]]; then
export DEBIAN_FRONTEND=noninteractive && apt-get --assume-yes update && apt-get --assume-yes install libcrypto++-dev && apt-get clean && rm -rf /var/lib/apt/lists/*

cd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId
hg clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/orthanc-object-storage/Common/StoragePlugin.cpp

Expand All @@ -580,7 +580,7 @@ elif [[ $target == "orthanc-azure-storage" ]]; then
export DEBIAN_FRONTEND=noninteractive && apt-get --assume-yes update && apt-get --assume-yes install libcrypto++-dev && apt-get clean && rm -rf /var/lib/apt/lists/*

cd $sourcesRootPath
hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId
hg clone https://orthanc.uclouvain.be/hg/orthanc-object-storage/ -r $commitId

patch_version_name_on_unstable "return PLUGIN_VERSION" $sourcesRootPath/orthanc-object-storage/Common/StoragePlugin.cpp

Expand All @@ -598,7 +598,7 @@ elif [[ $target == "orthanc-webviewer" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-webviewer/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-webviewer/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -616,7 +616,7 @@ elif [[ $target == "orthanc-transfers" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-transfers/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-transfers/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_PLUGIN_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -635,7 +635,7 @@ elif [[ $target == "orthanc-dicomweb" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-dicomweb/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-dicomweb/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_DICOM_WEB_VERSION" $sourcesRootPath/Plugin/Plugin.cpp

Expand All @@ -653,7 +653,7 @@ elif [[ $target == "orthanc-wsi" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-wsi/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-wsi/ -r $commitId $sourcesRootPath

patch_version_name_on_unstable "return ORTHANC_WSI_VERSION" $sourcesRootPath/ViewerPlugin/Plugin.cpp

Expand Down Expand Up @@ -690,7 +690,7 @@ elif [[ $target == "orthanc-stone-wasm" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-stone/ -r $commitId /source
hg clone https://orthanc.uclouvain.be/hg/orthanc-stone/ -r $commitId /source
pushd /source/Applications/StoneWebViewer/WebAssembly
chmod +x docker-internal.sh
STONE_BRANCH=${commitId} ./docker-internal.sh Release
Expand All @@ -717,7 +717,7 @@ elif [[ $target == "orthanc-stone-so" ]]; then

if [[ $dl != 0 ]]; then

hg --debug clone https://orthanc.uclouvain.be/hg/orthanc-stone/ -r $commitId $sourcesRootPath
hg clone https://orthanc.uclouvain.be/hg/orthanc-stone/ -r $commitId $sourcesRootPath

# StoneViewer is quite often on a non stable branch -> if its version is "mainline", always append the commit id
if grep -q "set(STONE_WEB_VIEWER_VERSION \"mainline\")" "$sourcesRootPath/Applications/StoneWebViewer/Version.cmake"; then
Expand Down
3 changes: 2 additions & 1 deletion local-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ if [[ $step == "push" ]]; then

# push to orthancteam/orthanc-pre-release only. The manifest will be pushed to orthancteam/orthanc
if [[ $isTag == "true" ]] && [[ $version == "stable" ]]; then
final_tag=$pushTag-$arch
# final_tag=$pushTag-$arch
final_tag=$pushTag
else
# otherwise we push to orthancteam/orthanc-pre-release

Expand Down

0 comments on commit b0ecae9

Please sign in to comment.