From 228cb074fc817ad6ff453ea7ac404bfcdaa1c6c3 Mon Sep 17 00:00:00 2001
From: Ping Xiang <64551395+pxaws@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:55:33 -0700
Subject: [PATCH 1/2] Update Dockerfile

Update Dockerfile to use public ECR image
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b6fd975906..99476fd7b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # permissions and limitations under the License.
 
 # Stage 1: Build the cp-utility binary
-FROM rust:1.73 as builder
+FROM public.ecr.aws/docker/library/rust:1.75 as builder
 
 WORKDIR /usr/src/cp-utility
 COPY ./tools/cp-utility .

From ab69250f053b643387b485f6321637379e5c3691 Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Thu, 17 Oct 2024 23:03:28 +0000
Subject: [PATCH 2/2] Fix build failure

upgrade jib

fix pr build
---
 .github/workflows/pr-build.yml | 2 ++
 buildSrc/build.gradle.kts      | 2 +-
 settings.gradle.kts            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 8bea654285..47bc1d6f00 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -103,6 +103,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: image=moby/buildkit:v0.15.1
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
       - name: Build image for testing
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 2390ed6da6..2c5d3e28eb 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,5 +8,5 @@ repositories {
 }
 
 dependencies {
-  implementation("com.google.cloud.tools:jib-gradle-plugin:3.4.0")
+  implementation("com.google.cloud.tools:jib-gradle-plugin:3.4.3")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 78015c0223..a9cf0e7041 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,7 @@ pluginManagement {
     id("com.github.ben-manes.versions") version "0.49.0"
     id("com.github.jk1.dependency-license-report") version "2.5"
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.google.cloud.tools.jib") version "3.4.0"
+    id("com.google.cloud.tools.jib") version "3.4.3"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
     id("nebula.release") version "17.2.2"
     id("org.springframework.boot") version "2.7.15"