From d552ff378a221fce028cd57984bd88c33843c272 Mon Sep 17 00:00:00 2001
From: Alexandru Mahmoud <mahmoudalexandru@gmail.com>
Date: Mon, 10 Mar 2025 13:50:28 -0400
Subject: [PATCH 1/3] Add arch to container name

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ce9fd24..3ebabb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,12 @@ ARG amd64_tag=latest
 FROM ${BASE_IMAGE}:${arm64_tag} AS base-arm64
 # This will persist in final image
 ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=FALSE
+ENV BIOCONDUCTOR_NAME="bioconductor_docker-arm64"
 
 FROM ${BASE_IMAGE}:${amd64_tag} AS base-amd64
 # This will persist in final image
 ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=TRUE
+ENV BIOCONDUCTOR_NAME="bioconductor_docker-amd64"
 
 # Set automatically when building with --platform
 ARG TARGETARCH
@@ -75,7 +77,6 @@ ENV LIBSBML_CFLAGS="-I/usr/include"
 ENV LIBSBML_LIBS="-lsbml"
 ENV BIOCONDUCTOR_DOCKER_VERSION=$BIOCONDUCTOR_DOCKER_VERSION
 ENV BIOCONDUCTOR_VERSION=$BIOCONDUCTOR_VERSION
-ENV BIOCONDUCTOR_NAME="bioconductor_docker"
 
 # Init command for s6-overlay
 CMD ["/init"]

From aecbb5e843ce4f14387c7aaf5ca4d6cd2a21f384 Mon Sep 17 00:00:00 2001
From: Alexandru Mahmoud <mahmoudalexandru@gmail.com>
Date: Thu, 22 May 2025 14:40:58 -0400
Subject: [PATCH 2/3] Leave amd without suffix for backwards compatibility

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3ebabb6..a20b6fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV BIOCONDUCTOR_NAME="bioconductor_docker-arm64"
 FROM ${BASE_IMAGE}:${amd64_tag} AS base-amd64
 # This will persist in final image
 ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=TRUE
-ENV BIOCONDUCTOR_NAME="bioconductor_docker-amd64"
+ENV BIOCONDUCTOR_NAME="bioconductor_docker"
 
 # Set automatically when building with --platform
 ARG TARGETARCH

From ec04fb0de34c793882f2046fe5da1054215bd8b0 Mon Sep 17 00:00:00 2001
From: Alexandru Mahmoud <mahmoudalexandru@gmail.com>
Date: Mon, 27 Oct 2025 23:02:11 +0100
Subject: [PATCH 3/3] Add '_devel-$TARGETARCH' to BIOCONDUCTOR_NAME

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a20b6fe..348d1f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,10 @@ ARG amd64_tag=latest
 FROM ${BASE_IMAGE}:${arm64_tag} AS base-arm64
 # This will persist in final image
 ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=FALSE
-ENV BIOCONDUCTOR_NAME="bioconductor_docker-arm64"
 
 FROM ${BASE_IMAGE}:${amd64_tag} AS base-amd64
 # This will persist in final image
 ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=TRUE
-ENV BIOCONDUCTOR_NAME="bioconductor_docker"
 
 # Set automatically when building with --platform
 ARG TARGETARCH
@@ -70,6 +68,8 @@ ARG BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_VERSION}.${BIOCONDUCTOR_PATCH}
 # Set automatically when building with --platform
 ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+ARG TARGETARCH
+ENV TARGETARCH=${TARGETARCH:-amd64}
 
 ## Set env variables
 ENV PLATFORM=${TARGETPLATFORM}
@@ -77,6 +77,7 @@ ENV LIBSBML_CFLAGS="-I/usr/include"
 ENV LIBSBML_LIBS="-lsbml"
 ENV BIOCONDUCTOR_DOCKER_VERSION=$BIOCONDUCTOR_DOCKER_VERSION
 ENV BIOCONDUCTOR_VERSION=$BIOCONDUCTOR_VERSION
+ENV BIOCONDUCTOR_NAME="bioconductor_docker_devel-$TARGETARCH"
 
 # Init command for s6-overlay
 CMD ["/init"]