From 2a0347c86a1d0c4ff8c5e660366e6c77f3b66e20 Mon Sep 17 00:00:00 2001
From: Harry Pidcock <harry.pidcock@canonical.com>
Date: Thu, 24 Aug 2023 10:06:40 +1000
Subject: [PATCH 1/2] Support ECR

---
 .github/workflows/release.yaml |  7 +++++++
 images.yaml                    | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 2717056..fddfec2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -109,6 +109,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Login to ECR Public 
+        uses: docker/login-action@v2
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.RELEASE_ECR_ACCESS_KEY_ID }}
+          password: ${{ secrets.RELEASE_ECR_SECRET_ACCESS_KEY }}
+
       - name: Push images
         if: ${{ success() && github.ref == 'refs/heads/master' }}
         run: |
diff --git a/images.yaml b/images.yaml
index 28d980f..867320d 100644
--- a/images.yaml
+++ b/images.yaml
@@ -4,7 +4,8 @@ images:
     dockerfile: Dockerfile-ubuntu
     context: ubuntu-context
     registry_paths:
-      - jujusolutions/charm-base
+      - docker.io/jujusolutions/charm-base
+      - public.ecr.aws/juju/charm-base
     tags:
       - ubuntu-22.04
       - latest
@@ -16,7 +17,7 @@ images:
       - linux/riscv64
     build_args:
       - "BASE_IMAGE=ubuntu:22.04"
-    juju_test_channel: 3.0/stable
+    juju_test_channel: 3.1/stable
     microk8s_test_channel: 1.25-strict/stable
     series: jammy
 
@@ -25,7 +26,8 @@ images:
     dockerfile: Dockerfile-ubuntu
     context: ubuntu-context
     registry_paths:
-      - jujusolutions/charm-base
+      - docker.io/jujusolutions/charm-base
+      - public.ecr.aws/juju/charm-base
     tags:
       - ubuntu-20.04
     platforms:
@@ -45,7 +47,8 @@ images:
     dockerfile: Dockerfile-ubuntu
     context: ubuntu-context
     registry_paths:
-      - jujusolutions/charm-base
+      - docker.io/jujusolutions/charm-base
+      - public.ecr.aws/juju/charm-base
     tags:
       - ubuntu-18.04
     platforms:

From cb54c60374084db1dc386b86af636d6fd5ae9690 Mon Sep 17 00:00:00 2001
From: Harry Pidcock <harry.pidcock@canonical.com>
Date: Thu, 24 Aug 2023 10:08:41 +1000
Subject: [PATCH 2/2] Pull from ecr.

---
 images.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images.yaml b/images.yaml
index 867320d..b236a78 100644
--- a/images.yaml
+++ b/images.yaml
@@ -16,7 +16,7 @@ images:
       - linux/s390x
       - linux/riscv64
     build_args:
-      - "BASE_IMAGE=ubuntu:22.04"
+      - "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:22.04"
     juju_test_channel: 3.1/stable
     microk8s_test_channel: 1.25-strict/stable
     series: jammy
@@ -37,7 +37,7 @@ images:
       - linux/s390x
       - linux/riscv64
     build_args:
-      - "BASE_IMAGE=ubuntu:20.04"
+      - "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:20.04"
     juju_test_channel: 2.9/stable
     microk8s_test_channel: 1.25/stable
     series: focal
@@ -57,7 +57,7 @@ images:
       - linux/ppc64le
       - linux/s390x
     build_args:
-      - "BASE_IMAGE=ubuntu:18.04"
+      - "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:18.04"
     juju_test_channel: 2.9/stable
     microk8s_test_channel: 1.25/stable
     series: bionic