From 8db9ca81f0009afeee2fdd4e528eb4ed33ed73b5 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 21 Mar 2023 14:14:23 -0700
Subject: [PATCH] WIP

---
 eng/dockerfile-templates/Dockerfile.common-dotnet-envs          | 2 +-
 src/runtime-deps/6.0/cbl-mariner1.0-distroless/amd64/Dockerfile | 2 --
 src/runtime-deps/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile | 2 --
 .../6.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile            | 2 --
 src/runtime-deps/7.0/cbl-mariner2.0-distroless/amd64/Dockerfile | 2 --
 .../7.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile            | 2 --
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/eng/dockerfile-templates/Dockerfile.common-dotnet-envs b/eng/dockerfile-templates/Dockerfile.common-dotnet-envs
index 20f7e40d62..d522b79999 100644
--- a/eng/dockerfile-templates/Dockerfile.common-dotnet-envs
+++ b/eng/dockerfile-templates/Dockerfile.common-dotnet-envs
@@ -8,7 +8,7 @@
     set isDistroless to find(OS_VERSION, "distroless") >= 0 || find(OS_VERSION, "chiseled") >= 0 ^
     set lineContinuation to when(isWindows, "`", "\") ^
     set port to when(isDistroless || (dotnetVersion != "6.0" && dotnetVersion != "7.0"), "8080", "80")
-}}ENV {{lineContinuation}}{{if (!isWindows && dotnetVersion != "6.0" && dotnetVersion != "7.0") || isDistroless:
+}}ENV {{lineContinuation}}{{if (!isWindows && dotnetVersion != "6.0" && dotnetVersion != "7.0") || (isDistroless && !isMariner):
     # UID of the non-root user 'app'
     APP_UID={{ARGS["uid"]}} {{lineContinuation}}}}
     # Configure web servers to bind to port {{port}} when present
diff --git a/src/runtime-deps/6.0/cbl-mariner1.0-distroless/amd64/Dockerfile b/src/runtime-deps/6.0/cbl-mariner1.0-distroless/amd64/Dockerfile
index 3e17e9f1f0..d586f00501 100644
--- a/src/runtime-deps/6.0/cbl-mariner1.0-distroless/amd64/Dockerfile
+++ b/src/runtime-deps/6.0/cbl-mariner1.0-distroless/amd64/Dockerfile
@@ -52,8 +52,6 @@ FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:1.0
 COPY --from=installer /staging/ /
 
 ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1000 \
     # Configure web servers to bind to port 8080 when present
     ASPNETCORE_URLS=http://+:8080 \
     # Enable detection of running in a container
diff --git a/src/runtime-deps/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile b/src/runtime-deps/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile
index dd1c7b8011..d2888316cf 100644
--- a/src/runtime-deps/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile
+++ b/src/runtime-deps/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile
@@ -61,8 +61,6 @@ FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
 COPY --from=installer /staging/ /
 
 ENV \
-    # UID of the non-root user 'app'
-    APP_UID=101 \
     # Configure web servers to bind to port 8080 when present
     ASPNETCORE_URLS=http://+:8080 \
     # Enable detection of running in a container
diff --git a/src/runtime-deps/6.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/6.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
index dd1c7b8011..d2888316cf 100644
--- a/src/runtime-deps/6.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime-deps/6.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
@@ -61,8 +61,6 @@ FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
 COPY --from=installer /staging/ /
 
 ENV \
-    # UID of the non-root user 'app'
-    APP_UID=101 \
     # Configure web servers to bind to port 8080 when present
     ASPNETCORE_URLS=http://+:8080 \
     # Enable detection of running in a container
diff --git a/src/runtime-deps/7.0/cbl-mariner2.0-distroless/amd64/Dockerfile b/src/runtime-deps/7.0/cbl-mariner2.0-distroless/amd64/Dockerfile
index 312f3b0bef..5d5f409476 100644
--- a/src/runtime-deps/7.0/cbl-mariner2.0-distroless/amd64/Dockerfile
+++ b/src/runtime-deps/7.0/cbl-mariner2.0-distroless/amd64/Dockerfile
@@ -64,8 +64,6 @@ COPY --from=installer /staging/ /
 COPY --from=installer --chown=101:101 /staging/home/app /home/app
 
 ENV \
-    # UID of the non-root user 'app'
-    APP_UID=101 \
     # Configure web servers to bind to port 8080 when present
     ASPNETCORE_URLS=http://+:8080 \
     # Enable detection of running in a container
diff --git a/src/runtime-deps/7.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/7.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
index 312f3b0bef..5d5f409476 100644
--- a/src/runtime-deps/7.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime-deps/7.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
@@ -64,8 +64,6 @@ COPY --from=installer /staging/ /
 COPY --from=installer --chown=101:101 /staging/home/app /home/app
 
 ENV \
-    # UID of the non-root user 'app'
-    APP_UID=101 \
     # Configure web servers to bind to port 8080 when present
     ASPNETCORE_URLS=http://+:8080 \
     # Enable detection of running in a container