From 64b17aa6f792d360b3afafe26e5b08bda566ea5e Mon Sep 17 00:00:00 2001
From: Christian Berkhoff <berkhoff@meta.com>
Date: Wed, 11 Sep 2024 10:15:02 -0700
Subject: [PATCH 1/3] Updating debian and using Rust image

---
 docker/helper.Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/helper.Dockerfile b/docker/helper.Dockerfile
index 52c0806ab..fc113222d 100644
--- a/docker/helper.Dockerfile
+++ b/docker/helper.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SOURCES_DIR=/usr/src/ipa
-FROM rust:bullseye AS builder
+FROM rust:bookworm AS builder
 ARG SOURCES_DIR
 
 # Prepare helper binaries
@@ -10,7 +10,7 @@ RUN set -eux; \
     cargo build --bin helper --release --no-default-features --features "web-app real-world-infra compact-gate"
 
 # Copy them to the final image
-FROM debian:bullseye-slim
+FROM rust:slim-bookworm
 ENV HELPER_BIN_PATH=/usr/local/bin/ipa-helper
 ENV CONF_DIR=/etc/ipa
 ARG SOURCES_DIR

From ad7fa8f0142fb91ddbb60256fea829feec95e280 Mon Sep 17 00:00:00 2001
From: Christian Berkhoff <berkhoff@meta.com>
Date: Thu, 12 Sep 2024 15:05:17 -0700
Subject: [PATCH 2/3] Updated GH actions

---
 .github/workflows/docker.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 12c6d40bb..6a8b555d1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,7 +34,9 @@ jobs:
           type=sha
 
     - name: "Setup Docker Buildx"
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
+      with:
+        platforms: linux/amd64
 
     - name: "Login to GitHub Container Registry"
       uses: docker/login-action@v2
@@ -44,7 +46,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: "Build and Publish Helper Image"
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./docker/ci/helper.Dockerfile

From 182e8e4bcdb515d5a13ab869f6fa365817e6882c Mon Sep 17 00:00:00 2001
From: Christian Berkhoff <berkhoff@meta.com>
Date: Thu, 12 Sep 2024 15:17:33 -0700
Subject: [PATCH 3/3] Removing confusing Docker CI config

---
 .github/workflows/docker.yml |  2 +-
 docker/ci/helper.Dockerfile  | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 docker/ci/helper.Dockerfile

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6a8b555d1..8b47bf627 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -49,7 +49,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: .
-        file: ./docker/ci/helper.Dockerfile
+        file: ./docker/helper.Dockerfile
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/docker/ci/helper.Dockerfile b/docker/ci/helper.Dockerfile
deleted file mode 100644
index 7f7b4d376..000000000
--- a/docker/ci/helper.Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM rust:latest as builder
-
-COPY . /ipa/
-RUN cd /ipa && \
-  cargo build --bin helper --release --no-default-features \
-        --features "web-app real-world-infra compact-gate"
-
-# Copy them to the final image
-FROM debian:bullseye-slim
-
-COPY --from=builder /ipa/target/release/helper /bin/ipa-helper
-ENTRYPOINT ["/bin/ipa-helper"]