clean up

backup_.github/workflows/all-builds.yml → .github/workflows/all-builds.yml

@@ -1,16 +1,16 @@
 name: all-builds
 
-on:
-  schedule:
-    - cron: "0 23 * * *"
-  push:
-    branches: 
-      - '*'
-    tags:
-      - '*'
-
-  pull_request:
-    branches: [ master ]
+on: workflow_dispatch
+  # schedule:
+  #   - cron: "0 23 * * *"
+  # push:
+  #   branches: 
+  #     - '*'
+  #   tags:
+  #     - '*'
+
+  # pull_request:
+  #   branches: [ master ]
 
 
 jobs:

.github/workflows/civ2.yml → .github/workflows/gen3-build-orthanc.yml

@@ -51,41 +51,10 @@ jobs:
         with:
           images: |
             quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-          # ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-
-      # - name: Build and push
-      #   if: ${{ !inputs.USE_QUAY_ONLY }}
-      #   uses: docker/build-push-action@v6
-      #   # You may get ECR-push errors when first adding the workflow to a github repo.
-      #   # If so, run the following in dev/qa to create the ECR repository:
-      #   # qaplanetv1@cdistest_dev_admin:~$ aws ecr create-repository --repository-name "gen3/<repo name>" --image-scanning-configuration scanOnPush=true
-      #   with:
-      #     context: ${{ inputs.DOCKERFILE_BUILD_CONTEXT }}
-      #     file: ${{ inputs.DOCKERFILE_LOCATION }}
-      #     push: true
-      #     tags: |
-      #       ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-      #       quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-      #     labels: ${{ steps.meta.outputs.labels }}
-      #     cache-from: type=registry,ref=${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:cache
-      #     cache-to: type=registry,ref=${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:cache,mode=max,image-manifest=true,oci-mediatypes=true
-      #     platforms: ${{ inputs.BUILD_PLATFORMS }}
-
-      # - name: Build and push (Quay only)
-      #   if: ${{ inputs.USE_QUAY_ONLY }}
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: ${{ inputs.DOCKERFILE_BUILD_CONTEXT }}
-      #     file: ${{ inputs.DOCKERFILE_LOCATION }}
-      #     push: true
-      #     tags: |
-      #       quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-      #     labels: ${{ steps.meta.outputs.labels }}
-      #     platforms: ${{ inputs.BUILD_PLATFORMS }}
+            ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
 
       # TODO linux/arm64 image
       - name: Build linux/amd64 image
-      # TODO add image name
         run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=build currentTag=${{ env.IMAGE_TAG }}
 
       - name: Push linux/amd64 image

docker/orthanc/build-or-download.sh

@@ -97,6 +97,7 @@ if [[ $target == "orthanc" ]]; then
         # also force latest OpenSSL (and therefore, we need to force static libcurl)
         cmake -DALLOW_DOWNLOADS=ON -DCMAKE_BUILD_TYPE:STRING=Release -DSTANDALONE_BUILD=ON -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_DCMTK=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_CURL=OFF $sourcesRootPath/OrthancServer
         make -j 4
+        # HttpClient.Ssl and HttpClient.SslNoVerification are failing
         # $buildRootPath/UnitTests
 
         upload Orthanc

local-build.sh

@@ -231,7 +231,7 @@ fi
 
 add_host_cmd=--add-host=orthanc.uclouvain.be:130.104.229.21
 
-# ###### runner-base
+###### runner-base
 # docker $build \
 #     $add_host_cmd \
 #     --progress=plain --platform=$platform -t orthancteam/orthanc-runner-base:$BASE_BUILDER_IMAGE_TAG \
@@ -241,7 +241,7 @@ add_host_cmd=--add-host=orthanc.uclouvain.be:130.104.229.21
 #     $push_load_arg_builder_image \
 #     -f docker/orthanc/Dockerfile.runner-base docker/orthanc
 
-# ###### builder-base
+###### builder-base
 # docker $build \
 #     $add_host_cmd \
 #     --progress=plain --platform=$platform -t orthancteam/orthanc-builder-base:$BASE_BUILDER_IMAGE_TAG \