From 3d2f391bdd57eec8a7e4ac85e56dff9a1af1a0c2 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:25:49 -0600 Subject: [PATCH] shorten --- {.github/workflows => backup_.github}/ci.yaml | 0 docker/orthanc/AmazonLinux2Dockerfile | 4 +- local-build.sh | 149 +++++++++--------- 3 files changed, 78 insertions(+), 75 deletions(-) rename {.github/workflows => backup_.github}/ci.yaml (100%) diff --git a/.github/workflows/ci.yaml b/backup_.github/ci.yaml similarity index 100% rename from .github/workflows/ci.yaml rename to backup_.github/ci.yaml diff --git a/docker/orthanc/AmazonLinux2Dockerfile b/docker/orthanc/AmazonLinux2Dockerfile index 6df92cf..5c41f8f 100644 --- a/docker/orthanc/AmazonLinux2Dockerfile +++ b/docker/orthanc/AmazonLinux2Dockerfile @@ -201,8 +201,8 @@ RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc com FROM orthanc-builder-base AS build-plugin-pg ARG ORTHANC_PG_COMMIT_ID -RUN echo debughere -RUN hg --debug clone "https://bitbucket.org/sjodogne/orthanc" +# RUN echo debughere +# RUN hg --debug clone "https://bitbucket.org/sjodogne/orthanc" RUN /scripts/build-or-download.sh version=$STABLE_OR_UNSTABLE target=orthanc-pg commitId=$ORTHANC_PG_COMMIT_ID baseImage=$PLATFORM/$BASE_IMAGE_TAG preferDownloads=$PREFER_DOWNLOADS enableUploads=$ENABLE_UPLOAD # ########################## Orthanc MySQL diff --git a/local-build.sh b/local-build.sh index a18c7ec..94a77b7 100755 --- a/local-build.sh +++ b/local-build.sh @@ -64,30 +64,30 @@ echo "image = $image" # get version number from build-matrix.json (stable or unstable) # note: we get the last commit id from a branch to detect last changes in a branch -ORTHANC_COMMIT_ID=$(getCommitId "Orthanc" $version docker $skipCommitChecks $throttle) -ORTHANC_GDCM_COMMIT_ID=$(getCommitId "Orthanc-gdcm" $version docker $skipCommitChecks $throttle) -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_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_ODBC_COMMIT_ID=$(getCommitId "Orthanc-odbc" $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) -ORTHANC_AZURE_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-azure-storage" $version docker $skipCommitChecks $throttle) -ORTHANC_GOOGLE_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-google-storage" $version docker $skipCommitChecks $throttle) -ORTHANC_AWS_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-aws-storage" $version docker $skipCommitChecks $throttle) -ORTHANC_OE2_COMMIT_ID=$(getCommitId "Orthanc-explorer-2" $version docker $skipCommitChecks $throttle) -ORTHANC_OE2_VERSION=$(getBranchTagToBuildDocker "Orthanc-explorer-2" $version $throttle) -ORTHANC_VOLVIEW_COMMIT_ID=$(getCommitId "Orthanc-volview" $version docker $skipCommitChecks $throttle) -ORTHANC_OHIF_COMMIT_ID=$(getCommitId "Orthanc-ohif" $version docker $skipCommitChecks $throttle) -ORTHANC_STL_COMMIT_ID=$(getCommitId "Orthanc-stl" $version docker $skipCommitChecks $throttle) -ORTHANC_JAVA_COMMIT_ID=$(getCommitId "Orthanc-java" $version docker $skipCommitChecks $throttle) +# ORTHANC_COMMIT_ID=$(getCommitId "Orthanc" $version docker $skipCommitChecks $throttle) +# ORTHANC_GDCM_COMMIT_ID=$(getCommitId "Orthanc-gdcm" $version docker $skipCommitChecks $throttle) +# 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_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_ODBC_COMMIT_ID=$(getCommitId "Orthanc-odbc" $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) +# ORTHANC_AZURE_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-azure-storage" $version docker $skipCommitChecks $throttle) +# ORTHANC_GOOGLE_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-google-storage" $version docker $skipCommitChecks $throttle) +# ORTHANC_AWS_STORAGE_COMMIT_ID=$(getCommitId "Orthanc-aws-storage" $version docker $skipCommitChecks $throttle) +# ORTHANC_OE2_COMMIT_ID=$(getCommitId "Orthanc-explorer-2" $version docker $skipCommitChecks $throttle) +# ORTHANC_OE2_VERSION=$(getBranchTagToBuildDocker "Orthanc-explorer-2" $version $throttle) +# ORTHANC_VOLVIEW_COMMIT_ID=$(getCommitId "Orthanc-volview" $version docker $skipCommitChecks $throttle) +# ORTHANC_OHIF_COMMIT_ID=$(getCommitId "Orthanc-ohif" $version docker $skipCommitChecks $throttle) +# ORTHANC_STL_COMMIT_ID=$(getCommitId "Orthanc-stl" $version docker $skipCommitChecks $throttle) +# ORTHANC_JAVA_COMMIT_ID=$(getCommitId "Orthanc-java" $version docker $skipCommitChecks $throttle) BASE_DEBIAN_IMAGE=bookworm-20250113-slim BASE_BUILDER_IMAGE_TAG=$BASE_DEBIAN_IMAGE-$version @@ -293,57 +293,60 @@ if [[ $image == "full" ]]; then fi -for target in $buildTargets; do +# for target in $buildTargets; do - if [[ $target == $finalImageTarget ]]; then + # if [[ $target == $finalImageTarget ]]; then tag_arg="--tag orthancteam/orthanc:$final_tag" - else - tag_arg= - fi + # else + # tag_arg= + # fi + + docker buildx build --add-host=orthanc.uclouvain.be:130.104.229.21 --progress=plain --platform=linux/amd64 $push_load_arg_final_image $tag_arg -f docker/orthanc/AmazonLinux2Dockerfile docker/orthanc/ + # sleep 5 ###### orthancteam/orthanc - docker $build \ - $add_host_cmd \ - --progress=plain --platform=$platform \ - --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_MYSQL_COMMIT_ID=$ORTHANC_MYSQL_COMMIT_ID \ - --build-arg ORTHANC_TRANSFERS_COMMIT_ID=$ORTHANC_TRANSFERS_COMMIT_ID \ - --build-arg ORTHANC_DW_COMMIT_ID=$ORTHANC_DW_COMMIT_ID \ - --build-arg ORTHANC_WSI_COMMIT_ID=$ORTHANC_WSI_COMMIT_ID \ - --build-arg ORTHANC_OWV_COMMIT_ID=$ORTHANC_OWV_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_ODBC_COMMIT_ID=$ORTHANC_ODBC_COMMIT_ID \ - --build-arg ORTHANC_INDEXER_COMMIT_ID=$ORTHANC_INDEXER_COMMIT_ID \ - --build-arg ORTHANC_NEURO_COMMIT_ID=$ORTHANC_NEURO_COMMIT_ID \ - --build-arg ORTHANC_TCIA_COMMIT_ID=$ORTHANC_TCIA_COMMIT_ID \ - --build-arg ORTHANC_STONE_VIEWER_COMMIT_ID=$ORTHANC_STONE_VIEWER_COMMIT_ID \ - --build-arg ORTHANC_AZURE_STORAGE_COMMIT_ID=$ORTHANC_AZURE_STORAGE_COMMIT_ID \ - --build-arg ORTHANC_GOOGLE_STORAGE_COMMIT_ID=$ORTHANC_GOOGLE_STORAGE_COMMIT_ID \ - --build-arg ORTHANC_AWS_STORAGE_COMMIT_ID=$ORTHANC_AWS_STORAGE_COMMIT_ID \ - --build-arg ORTHANC_OE2_COMMIT_ID=$ORTHANC_OE2_COMMIT_ID \ - --build-arg ORTHANC_OE2_VERSION=$ORTHANC_OE2_VERSION \ - --build-arg ORTHANC_VOLVIEW_COMMIT_ID=$ORTHANC_VOLVIEW_COMMIT_ID \ - --build-arg ORTHANC_OHIF_COMMIT_ID=$ORTHANC_OHIF_COMMIT_ID \ - --build-arg ORTHANC_STL_COMMIT_ID=$ORTHANC_STL_COMMIT_ID \ - --build-arg ORTHANC_JAVA_COMMIT_ID=$ORTHANC_JAVA_COMMIT_ID \ - --build-arg BASE_IMAGE_TAG=$BASE_BUILDER_IMAGE_TAG \ - --build-arg ARG_AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ - --build-arg ARG_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \ - --build-arg PREFER_DOWNLOADS=$prefer_downloads \ - --build-arg ENABLE_UPLOAD=$enable_upload \ - --build-arg PLATFORM=$platform \ - --build-arg STONE_INTERMEDIATE_TARGET=build-stone-viewer-$shortPlatform \ - --build-arg STABLE_OR_UNSTABLE=$version \ - $from_cache_arg \ - $to_cache_arg \ - $push_load_arg_final_image \ - $tag_arg \ - # --target $target \ - # -f docker/orthanc/Dockerfile docker/orthanc/ - -f docker/orthanc/AmazonLinux2Dockerfile docker/orthanc/ - -done + # docker $build \ + # $add_host_cmd \ + # --progress=plain --platform=$platform \ + # # --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_MYSQL_COMMIT_ID=$ORTHANC_MYSQL_COMMIT_ID \ + # # --build-arg ORTHANC_TRANSFERS_COMMIT_ID=$ORTHANC_TRANSFERS_COMMIT_ID \ + # # --build-arg ORTHANC_DW_COMMIT_ID=$ORTHANC_DW_COMMIT_ID \ + # # --build-arg ORTHANC_WSI_COMMIT_ID=$ORTHANC_WSI_COMMIT_ID \ + # # --build-arg ORTHANC_OWV_COMMIT_ID=$ORTHANC_OWV_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_ODBC_COMMIT_ID=$ORTHANC_ODBC_COMMIT_ID \ + # # --build-arg ORTHANC_INDEXER_COMMIT_ID=$ORTHANC_INDEXER_COMMIT_ID \ + # # --build-arg ORTHANC_NEURO_COMMIT_ID=$ORTHANC_NEURO_COMMIT_ID \ + # # --build-arg ORTHANC_TCIA_COMMIT_ID=$ORTHANC_TCIA_COMMIT_ID \ + # # --build-arg ORTHANC_STONE_VIEWER_COMMIT_ID=$ORTHANC_STONE_VIEWER_COMMIT_ID \ + # # --build-arg ORTHANC_AZURE_STORAGE_COMMIT_ID=$ORTHANC_AZURE_STORAGE_COMMIT_ID \ + # # --build-arg ORTHANC_GOOGLE_STORAGE_COMMIT_ID=$ORTHANC_GOOGLE_STORAGE_COMMIT_ID \ + # # --build-arg ORTHANC_AWS_STORAGE_COMMIT_ID=$ORTHANC_AWS_STORAGE_COMMIT_ID \ + # # --build-arg ORTHANC_OE2_COMMIT_ID=$ORTHANC_OE2_COMMIT_ID \ + # # --build-arg ORTHANC_OE2_VERSION=$ORTHANC_OE2_VERSION \ + # # --build-arg ORTHANC_VOLVIEW_COMMIT_ID=$ORTHANC_VOLVIEW_COMMIT_ID \ + # # --build-arg ORTHANC_OHIF_COMMIT_ID=$ORTHANC_OHIF_COMMIT_ID \ + # # --build-arg ORTHANC_STL_COMMIT_ID=$ORTHANC_STL_COMMIT_ID \ + # # --build-arg ORTHANC_JAVA_COMMIT_ID=$ORTHANC_JAVA_COMMIT_ID \ + # --build-arg BASE_IMAGE_TAG=$BASE_BUILDER_IMAGE_TAG \ + # # --build-arg ARG_AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ + # # --build-arg ARG_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \ + # --build-arg PREFER_DOWNLOADS=$prefer_downloads \ + # --build-arg ENABLE_UPLOAD=$enable_upload \ + # --build-arg PLATFORM=$platform \ + # # --build-arg STONE_INTERMEDIATE_TARGET=build-stone-viewer-$shortPlatform \ + # # --build-arg STABLE_OR_UNSTABLE=$version \ + # # $from_cache_arg \ + # # $to_cache_arg \ + # $push_load_arg_final_image \ + # $tag_arg \ + # # --target $target \ + # # -f docker/orthanc/Dockerfile docker/orthanc/ + # -f docker/orthanc/AmazonLinux2Dockerfile docker/orthanc/ + +# done