From 6d1e2fbb2732c14d8544b4451eb31b9fe83ce45e Mon Sep 17 00:00:00 2001
From: Saniya <37302318+Saby-Bishops@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:43:29 -0600
Subject: [PATCH 1/2] Remove legacy ARM db-init Dockerfile

---
 docker/db-init/arm-Dockerfile          | 24 ------------------------
 docker/db-init/crosscompile_db-init.sh |  6 ++----
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 docker/db-init/arm-Dockerfile

diff --git a/docker/db-init/arm-Dockerfile b/docker/db-init/arm-Dockerfile
deleted file mode 100644
index 5801d3c431..0000000000
--- a/docker/db-init/arm-Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM ubuntu:xenial as builder
-LABEL maintainer="dogi@ole.org,mutugiii@ole.org"
-
-COPY ./docker/db-init/crosscompile_db-init.sh .
-RUN bash ./crosscompile_db-init.sh armv7 install
-
-#####
-
-FROM treehouses/node-tags:arm
-
-RUN apk update ;\
-    apk add --no-cache bash curl git jq ca-certificates;\
-    mkdir -p /usr/local/lib/node_modules; \
-    ln -s /usr/local/lib/node_modules/add-cors-to-couchdb/bin.js /usr/local/bin/add-cors-to-couchdb
-
-COPY --from=builder /usr/lib/node_modules /usr/local/lib/node_modules
-
-WORKDIR /root
-
-COPY ./docker/db-init/docker-entrypoint.sh /root/docker-entrypoint.sh
-COPY ./couchdb-setup.sh /root/couchdb-setup.sh
-ADD ./design /root/design
-
-CMD bash ./docker-entrypoint.sh
diff --git a/docker/db-init/crosscompile_db-init.sh b/docker/db-init/crosscompile_db-init.sh
index 7bf5f9c95e..aeec7103bc 100755
--- a/docker/db-init/crosscompile_db-init.sh
+++ b/docker/db-init/crosscompile_db-init.sh
@@ -3,13 +3,11 @@
 ARCH=$1
 ACT=$2
 
-if [[ "${ARCH}" == "armv7" ]]; then
-  TRIPLE="arm-linux-gnueabihf"
-  GCC="4.8"
-elif [[ "${ARCH}" == "armv8" ]]; then
+if [[ "${ARCH}" == "armv8" ]]; then
   TRIPLE="aarch64-linux-gnu"
   GCC="4.8"
 else
+  echo "Error: Unsupported architecture '${ARCH}'" >&2
   exit 1
 fi
 

From a818962ea99b72e516b227201142d4aa8379733b Mon Sep 17 00:00:00 2001
From: Saniya <37302318+Saby-Bishops@users.noreply.github.com>
Date: Wed, 10 Dec 2025 14:03:41 -0600
Subject: [PATCH 2/2] Update db-init workflow to drop arm builds

---
 .github/workflows/planet-db.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/planet-db.yml b/.github/workflows/planet-db.yml
index 8430e106a7..69c1950dd3 100644
--- a/.github/workflows/planet-db.yml
+++ b/.github/workflows/planet-db.yml
@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        arch: [ amd64, arm, arm64 ]
+        arch: [ amd64, arm64 ]
 
     steps:
       - name: Checkout Code
@@ -80,12 +80,9 @@ jobs:
           amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[0].image = strenv(amd64tag)' - | \
           yq e '.manifests[0].platform.architecture = "amd64"' - | \
           yq e '.manifests[0].platform.os = "linux"' - | \
-          armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(armtag)' - | \
-          yq e '.manifests[1].platform.architecture = "arm"' - | \
+          arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(arm64tag)' - | \
+          yq e '.manifests[1].platform.architecture = "arm64"' - | \
           yq e '.manifests[1].platform.os = "linux"' - | \
-          arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[2].image = strenv(arm64tag)' - | \
-          yq e '.manifests[2].platform.architecture = "arm64"' - | \
-          yq e '.manifests[2].platform.os = "linux"' - | \
           tee /tmp/MA_manifests/MA_db-init_latest.yaml
           manifest_tool push from-spec /tmp/MA_manifests/MA_db-init_latest.yaml
 
@@ -101,11 +98,8 @@ jobs:
           amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[0].image = strenv(amd64tag)' - | \
           yq e '.manifests[0].platform.architecture = "amd64"' - | \
           yq e '.manifests[0].platform.os = "linux"' - | \
-          armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(armtag)' - | \
-          yq e '.manifests[1].platform.architecture = "arm"' - | \
+          arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(arm64tag)' - | \
+          yq e '.manifests[1].platform.architecture = "arm64"' - | \
           yq e '.manifests[1].platform.os = "linux"' - | \
-          arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[2].image = strenv(arm64tag)' - | \
-          yq e '.manifests[2].platform.architecture = "arm64"' - | \
-          yq e '.manifests[2].platform.os = "linux"' - | \
           tee /tmp/MA_manifests/MA_db-init_versioned.yaml
           manifest_tool push from-spec /tmp/MA_manifests/MA_db-init_versioned.yaml