From 25a54b16f750df98a45242000c547c2dfcf4e898 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Tue, 5 Aug 2025 21:36:04 +0000
Subject: [PATCH] Fix Dockerfiles that had BUILDPLATFORM specified for App
 Stages (#6162)

---
 src/Api/Dockerfile      | 2 +-
 src/Billing/Dockerfile  | 2 +-
 src/Identity/Dockerfile | 2 +-
 util/Setup/Dockerfile   | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile
index 5815d06769..beacee89ae 100644
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile
index 8f1a217b0e..1e182dedff 100644
--- a/src/Billing/Dockerfile
+++ b/src/Billing/Dockerfile
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index 41f23f6957..e79439f275 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 80d00315e4..2ab86c69ed 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -26,7 +26,6 @@ WORKDIR /source/util/Setup
 RUN . /tmp/rid.txt && dotnet restore -r $RID
 
 # Build project
-WORKDIR /source/util/Setup
 RUN . /tmp/rid.txt && dotnet publish \
     -c release \
     --no-restore \
@@ -38,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden" com.bitwarden.project="setup"