From aefa3f6ad006faf25856c73a681ff9ecece2d930 Mon Sep 17 00:00:00 2001
From: David <9059044+Tansito@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:24:27 -0400
Subject: [PATCH] Cleanup some old configurations (#1435)

---
 .github/workflows/build-containers-test.yaml | 2 --
 .github/workflows/kubernetes-deploy.yaml     | 4 ++--
 CONTRIBUTING.md                              | 2 --
 Makefile                                     | 8 +-------
 docker-compose-dev.yaml                      | 2 --
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-containers-test.yaml b/.github/workflows/build-containers-test.yaml
index 72d1773f9..8d289d2ac 100644
--- a/.github/workflows/build-containers-test.yaml
+++ b/.github/workflows/build-containers-test.yaml
@@ -43,8 +43,6 @@ jobs:
           file: ./${{ matrix.dockerfile }}
           load: true
           tags: image:test
-          build-args:
-            IMAGE_PY_VERSION=${{ env.python_version }}
       - name: Inspect
         run: |
           docker image inspect image:test
diff --git a/.github/workflows/kubernetes-deploy.yaml b/.github/workflows/kubernetes-deploy.yaml
index 8ad89266e..85d205e0d 100644
--- a/.github/workflows/kubernetes-deploy.yaml
+++ b/.github/workflows/kubernetes-deploy.yaml
@@ -23,12 +23,12 @@ jobs:
           kind-worker-count: 0
       - name: Build and load gateway
         run: |
-          docker build -t gateway:test --build-arg TARGETARCH="amd64" -f ./gateway/Dockerfile .
+          docker build -t gateway:test -f ./gateway/Dockerfile .
           kind load docker-image gateway:test
           docker image rm gateway:test
       - name: Build and load ray node
         run: |
-          docker build -t ray:test --build-arg TARGETARCH="amd64" -f ./Dockerfile-ray-node .
+          docker build -t ray:test -f ./Dockerfile-ray-node .
           kind load docker-image ray:test
           docker image rm ray:test
       - name: Install helm chart
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 85722df3d..a44e8d563 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -164,8 +164,6 @@ If you wish to rebuild only a specific component (for example, the `gateway`), y
 
 ```docker compose -f docker-compose-dev.yaml build gateway```
 
-For Apple Silicon system (arm64 / aarch64), set `TARGETARCH=arm64` before running the `docker compose` command.
-
 ### Assigning yourself
 
 The very first step to working on an issue is
diff --git a/Makefile b/Makefile
index 4e21b24b9..fc19250e1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,6 @@
 
 version=latest
 repository=icr.io/quantum-public
-ifeq ($(shell uname -p), arm)
-	arch="arm64"
-else
-	arch="amd64"
-endif
-
 rayNodeImageName=$(repository)/qiskit-serverless/ray-node
 gatewayImageName=$(repository)/qiskit-serverless/gateway
 proxyImageName=$(repository)/qiskit-serverless/proxy
@@ -24,7 +18,7 @@ build-all: build-ray-node build-gateway build-proxy
 push-all: push-ray-node push-gateway push-proxy
 
 build-ray-node:
-	docker build -t $(rayNodeImageName):$(version) --build-arg TARGETARCH=$(arch) -f Dockerfile-ray-node .
+	docker build -t $(rayNodeImageName):$(version) -f Dockerfile-ray-node .
 
 build-gateway:
 	docker build -t $(gatewayImageName):$(version) -f ./gateway/Dockerfile .
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index cffe0f368..25da664e7 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -5,8 +5,6 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile-ray-node
-      args:
-        TARGETARCH: "${TARGETARCH:-amd64}"
     entrypoint: [
       "env", "RAY_LOG_TO_STDERR=1", "ray", "start", "--head", "--port=6379",
       "--dashboard-host=0.0.0.0", "--block"