From 8d052b613ff018ae49f331d9d39f4abbfb82fb99 Mon Sep 17 00:00:00 2001
From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:29:13 -0600
Subject: [PATCH] add debug logging, ecr push and cache

---
 .github/workflows/civ2.yml            | 19 +++++++++---------
 docker/orthanc/AmazonLinux2Dockerfile | 28 ++++++++++++++-------------
 local-build.sh                        | 10 ++++++++--
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/civ2.yml b/.github/workflows/civ2.yml
index 151f8e3..d3af1ff 100644
--- a/.github/workflows/civ2.yml
+++ b/.github/workflows/civ2.yml
@@ -18,16 +18,15 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
-      # TODO add ECR
-      # # https://github.com/docker/login-action#aws-public-elastic-container-registry-ecr
-      # - name: Login to ECR
-      #   uses: docker/login-action@v3
-      #   with:
-      #     registry: ${{ inputs.AWS_ECR_REGISTRY }}
-      #     username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
-      #     password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
-      #   env:
-      #     AWS_REGION: ${{ inputs.AWS_REGION }}
+      # https://github.com/docker/login-action#aws-public-elastic-container-registry-ecr
+      - name: Login to ECR
+        uses: docker/login-action@v3
+        with:
+          registry: 707767160287.dkr.ecr.us-east-1.amazonaws.com
+          username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: us-east-1
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/docker/orthanc/AmazonLinux2Dockerfile b/docker/orthanc/AmazonLinux2Dockerfile
index 50a0232..2313db8 100644
--- a/docker/orthanc/AmazonLinux2Dockerfile
+++ b/docker/orthanc/AmazonLinux2Dockerfile
@@ -155,8 +155,7 @@ COPY build-or-download.sh /scripts
 
 # ===> https://github.com/orthanc-server/orthanc-builder/blob/11d6930/docker/orthanc/Dockerfile
 
-# TODO is this part needed?
-FROM orthanc-builder-base
+# FROM orthanc-builder-base
 ARG ARG_AWS_ACCESS_KEY_ID
 ARG ARG_AWS_SECRET_ACCESS_KEY
 ENV AWS_ACCESS_KEY_ID=$ARG_AWS_ACCESS_KEY_ID
@@ -167,20 +166,20 @@ ARG PLATFORM=linux/amd64
 ARG STABLE_OR_UNSTABLE=stable
 
 
-FROM jodogne/wasm-builder:3.1.49 AS wasm-builder-base-amd64
+# FROM jodogne/wasm-builder:3.1.49 AS wasm-builder-base-amd64
 
-ARG ARG_AWS_ACCESS_KEY_ID
-ARG ARG_AWS_SECRET_ACCESS_KEY
-ENV AWS_ACCESS_KEY_ID=$ARG_AWS_ACCESS_KEY_ID
-ENV AWS_SECRET_ACCESS_KEY=$ARG_AWS_SECRET_ACCESS_KEY
-ARG PREFER_DOWNLOADS=1
-ARG ENABLE_UPLOAD=0
-ARG PLATFORM=linux/amd64
-ARG STABLE_OR_UNSTABLE=stable
+# ARG ARG_AWS_ACCESS_KEY_ID
+# ARG ARG_AWS_SECRET_ACCESS_KEY
+# ENV AWS_ACCESS_KEY_ID=$ARG_AWS_ACCESS_KEY_ID
+# ENV AWS_SECRET_ACCESS_KEY=$ARG_AWS_SECRET_ACCESS_KEY
+# ARG PREFER_DOWNLOADS=1
+# ARG ENABLE_UPLOAD=0
+# ARG PLATFORM=linux/amd64
+# ARG STABLE_OR_UNSTABLE=stable
 
 
-RUN mkdir -p /.aws && echo region=eu-west-1 > /.aws/credentials
-RUN DEBIAN_FRONTEND=noninteractive && apt-get --assume-yes update && apt-get -y --fix-broken install && DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install curl awscli
+# RUN mkdir -p /.aws && echo region=eu-west-1 > /.aws/credentials
+# RUN DEBIAN_FRONTEND=noninteractive && apt-get --assume-yes update && apt-get -y --fix-broken install && DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install curl awscli
 
 ########################## Orthanc
 
@@ -506,3 +505,6 @@ RUN groupadd --system orthanc --gid=999; \
     chown -R orthanc:orthanc /usr/share/orthanc/plugins-available; \
     echo not-generated > /etc/hostid; \
     chown orthanc:orthanc /etc/hostid
+
+# enable debug logging
+ENV VERBOSE_ENABLED=true
diff --git a/local-build.sh b/local-build.sh
index 4639b8c..baa5d42 100755
--- a/local-build.sh
+++ b/local-build.sh
@@ -122,8 +122,10 @@ if [[ $useBuildx == "true" ]]; then
     from_cache_arg_builder_vcpkg_google="--cache-from=orthancteam/orthanc-builder-base:cache-vcpkg-google-$BASE_BUILDER_IMAGE_TAG"
     to_cache_arg_builder_vcpkg_google="--cache-to=orthancteam/orthanc-builder-base:cache-vcpkg-google-$BASE_BUILDER_IMAGE_TAG"
 
-    from_cache_arg="--cache-from=orthancteam/orthanc-builder-base:cache-main-$BASE_BUILDER_IMAGE_TAG"
-    to_cache_arg="--cache-to=orthancteam/orthanc-builder-base:cache-main-$BASE_BUILDER_IMAGE_TAG"
+    # from_cache_arg="--cache-from=orthancteam/orthanc-builder-base:cache-main-$BASE_BUILDER_IMAGE_TAG"
+    # to_cache_arg="--cache-to=orthancteam/orthanc-builder-base:cache-main-$BASE_BUILDER_IMAGE_TAG"
+    from_cache_arg="--cache-from=type=registry,ref=707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:cache"
+    to_cache_arg="--cache-to=type=registry,ref=707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:cache,mode=max,image-manifest=true,oci-mediatypes=true"
 
     # when building in CI, use buildx
     build="buildx build"
@@ -196,6 +198,8 @@ if [[ $step == "push" ]]; then
     # docker push orthancteam/orthanc-pre-release:$final_tag
     docker tag orthancteam/orthanc:$currentTag quay.io/cdis/gen3-orthanc:$final_tag
     docker push quay.io/cdis/gen3-orthanc:$final_tag
+    docker tag orthancteam/orthanc:$currentTag 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:$final_tag
+    docker push 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-orthanc:$final_tag
 
     exit 0
 else
@@ -356,6 +360,8 @@ fi
         --build-arg ORTHANC_AUTH_COMMIT_ID=$ORTHANC_AUTH_COMMIT_ID \
         --build-arg ORTHANC_TCIA_COMMIT_ID=$ORTHANC_TCIA_COMMIT_ID \
         --build-arg PLATFORM=$platform \
+        $from_cache_arg \
+        $to_cache_arg \
         $push_load_arg_final_image \
         $tag_arg \
         -f docker/orthanc/AmazonLinux2Dockerfile docker/orthanc/