From 7ede15462d36b851b327f65345039868fdc27019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gurhem?= <jgurhem@aneo.fr>
Date: Fri, 5 Jan 2024 16:38:07 +0100
Subject: [PATCH 1/5] feat: use dotnet 8 chiseled images

---
 Dockerfile                          | 20 ++++++++++++--------
 Tests/Bench/Client/src/Dockerfile   |  6 ++----
 Tests/Bench/Server/src/Dockerfile   | 10 ++++++----
 Tests/HtcMock/Client/src/Dockerfile |  6 ++----
 Tests/HtcMock/Server/src/Dockerfile | 10 ++++++----
 Tests/Stream/Server/Dockerfile      | 10 ++++++----
 6 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3cd709638..04e5a59de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 as base
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled as base
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG VERSION=1.0.0.0
 ARG TARGETARCH
 
+RUN mkdir /cache /local_storage
+
 WORKDIR /src
 # git ls-tree -r HEAD --name-only --full-tree | grep "csproj$" | xargs -I % sh -c "export D=\$(dirname %) ; echo COPY [\\\"%\\\", \\\"\$D/\\\"]"
 COPY ["Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj", "Adaptors/Amqp/src/"]
@@ -72,6 +73,9 @@ WORKDIR /src/Control/Submitter/src
 RUN dotnet publish "ArmoniK.Core.Control.Submitter.csproj" -a $TARGETARCH --no-restore -o /app/publish/submitter /p:UseAppHost=false -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion=$VERSION -p:Version=$VERSION
 
 FROM base as polling_agent
+WORKDIR /
+COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
+COPY --from=build --chown=$APP_UID:$APP_UID /local_storage /local_storage
 WORKDIR /adapters/queue/pubsub
 COPY --from=build /app/publish/pubsub .
 WORKDIR /adapters/queue/amqp
@@ -80,8 +84,7 @@ WORKDIR /adapters/queue/rabbit
 COPY --from=build /app/publish/rabbit .
 WORKDIR /app
 COPY --from=build /app/publish/polling_agent .
-RUN mkdir /cache /local_storage && chown armonikuser: /cache /local_storage
-USER armonikuser
+USER $APP_UID
 
 ENV ASPNETCORE_URLS http://+:1080
 EXPOSE 1080
@@ -92,7 +95,7 @@ ENTRYPOINT ["dotnet", "ArmoniK.Core.Compute.PollingAgent.dll"]
 FROM base as metrics
 WORKDIR /app
 COPY --from=build /app/publish/metrics .
-USER armonikuser
+USER $APP_UID
 
 ENV ASPNETCORE_URLS http://+:1080
 EXPOSE 1080
@@ -103,7 +106,7 @@ ENTRYPOINT ["dotnet", "ArmoniK.Core.Control.Metrics.dll"]
 FROM base as partition_metrics
 WORKDIR /app
 COPY --from=build /app/publish/partition_metrics .
-USER armonikuser
+USER $APP_UID
 
 ENV ASPNETCORE_URLS http://+:1080
 EXPOSE 1080
@@ -112,6 +115,8 @@ ENTRYPOINT ["dotnet", "ArmoniK.Core.Control.PartitionMetrics.dll"]
 
 
 FROM base as submitter
+WORKDIR /
+COPY --from=build --chown=$APP_UID:$APP_UID /local_storage /local_storage
 WORKDIR /adapters/queue/pubsub
 COPY --from=build /app/publish/pubsub .
 WORKDIR /adapters/queue/amqp
@@ -120,8 +125,7 @@ WORKDIR /adapters/queue/rabbit
 COPY --from=build /app/publish/rabbit .
 WORKDIR /app
 COPY --from=build /app/publish/submitter .
-RUN mkdir /local_storage && chown armonikuser: /local_storage
-USER armonikuser
+USER $APP_UID
 
 ENV ASPNETCORE_URLS http://+:1080, http://+:1081
 EXPOSE 1080
diff --git a/Tests/Bench/Client/src/Dockerfile b/Tests/Bench/Client/src/Dockerfile
index 0d84a2916..0fa9c6a7b 100644
--- a/Tests/Bench/Client/src/Dockerfile
+++ b/Tests/Bench/Client/src/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
@@ -19,7 +19,5 @@ RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.Bench.Client.csproj" --no
 FROM base AS final
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-
-USER armonikuser
+USER $APP_UID
 ENTRYPOINT ["dotnet", "ArmoniK.Samples.Bench.Client.dll"]
diff --git a/Tests/Bench/Server/src/Dockerfile b/Tests/Bench/Server/src/Dockerfile
index 798fd5357..683d836a3 100644
--- a/Tests/Bench/Server/src/Dockerfile
+++ b/Tests/Bench/Server/src/Dockerfile
@@ -1,12 +1,14 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
+RUN mkdir /cache
+
 WORKDIR /src
 COPY ["Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj", "Tests/Bench/Server/src/"]
 RUN dotnet restore -a "${TARGETARCH}" "Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj"
@@ -15,10 +17,10 @@ WORKDIR "/src/Tests/Bench/Server/src"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.Bench.Server.csproj" -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
+WORKDIR /
+COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-RUN mkdir /cache && chown armonikuser: /cache
-USER armonikuser
+USER $APP_UID
 EXPOSE 1080
 ENTRYPOINT ["dotnet", "ArmoniK.Samples.Bench.Server.dll"]
diff --git a/Tests/HtcMock/Client/src/Dockerfile b/Tests/HtcMock/Client/src/Dockerfile
index e4263dcf8..d1d2138be 100644
--- a/Tests/HtcMock/Client/src/Dockerfile
+++ b/Tests/HtcMock/Client/src/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
@@ -19,7 +19,5 @@ RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.HtcMock.Client.csproj" --
 FROM base AS final
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-
-USER armonikuser
+USER $APP_UID
 ENTRYPOINT ["dotnet", "ArmoniK.Samples.HtcMock.Client.dll"]
diff --git a/Tests/HtcMock/Server/src/Dockerfile b/Tests/HtcMock/Server/src/Dockerfile
index 3cf709e31..d60399dd1 100644
--- a/Tests/HtcMock/Server/src/Dockerfile
+++ b/Tests/HtcMock/Server/src/Dockerfile
@@ -1,12 +1,14 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
+RUN mkdir /cache
+
 WORKDIR /src
 COPY ["Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj", "Tests/HtcMock/Server/src/"]
 RUN dotnet restore -a "${TARGETARCH}" "Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj"
@@ -15,10 +17,10 @@ WORKDIR "/src/Tests/HtcMock/Server/src"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.HtcMock.Server.csproj" -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
+WORKDIR /
+COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-RUN mkdir /cache && chown armonikuser: /cache
-USER armonikuser
 EXPOSE 1080
+USER $APP_UID
 ENTRYPOINT ["dotnet", "ArmoniK.Samples.HtcMock.Server.dll"]
diff --git a/Tests/Stream/Server/Dockerfile b/Tests/Stream/Server/Dockerfile
index c50a85872..0fa2fd390 100644
--- a/Tests/Stream/Server/Dockerfile
+++ b/Tests/Stream/Server/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 ENV ASPNETCORE_URLS http://+:1080;https://+1443
 EXPOSE 1080
@@ -10,6 +10,8 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
+RUN mkdir /cache
+
 WORKDIR /src
 COPY ["Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj", "Tests/Stream/Server/"]
 COPY ["Tests/Stream/Common/ArmoniK.Extensions.Common.StreamWrapper.Tests.Common.csproj", "Tests/Stream/Common/"]
@@ -20,10 +22,10 @@ WORKDIR "/src/Tests/Stream/Server"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj" --no-restore -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
+WORKDIR /
+COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-RUN mkdir /cache && chown armonikuser: /cache
-USER armonikuser
+USER $APP_UID
 
 ENTRYPOINT ["dotnet", "ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.dll"]

From dfcd61218455402b8906ecef49befa92231212bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gurhem?= <jgurhem@aneo.fr>
Date: Tue, 5 Mar 2024 17:49:06 +0100
Subject: [PATCH 2/5] ci: validate it can work with old workers

---
 terraform/modules/compute_plane/main.tf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/terraform/modules/compute_plane/main.tf b/terraform/modules/compute_plane/main.tf
index f974f9e1b..9132a58c2 100644
--- a/terraform/modules/compute_plane/main.tf
+++ b/terraform/modules/compute_plane/main.tf
@@ -1,5 +1,10 @@
 resource "docker_volume" "socket_vol" {
   name = "socket_vol${var.replica_counter}"
+  driver_opts = {
+    o : "uid=3333"
+    device : "tmpfs"
+    type : "tmpfs"
+  }
 }
 
 resource "docker_image" "worker" {
@@ -18,6 +23,7 @@ resource "docker_container" "worker" {
   env = concat(["Serilog__Properties__Application=${var.worker.serilog_application_name}"], local.gen_env, local.common_env)
 
   log_driver = var.log_driver.name
+  user       = 3333
 
   log_opts = {
     fluentd-address = var.log_driver.address
@@ -52,6 +58,7 @@ resource "docker_container" "polling_agent" {
 
   env = concat(local.env, local.gen_env, local.common_env)
 
+  user       = 3333
   log_driver = var.log_driver.name
 
   log_opts = {

From 95399c2e284cd090b6af662c0ff8a41f8482d94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gurhem?= <jgurhem@aneo.fr>
Date: Wed, 6 Mar 2024 09:08:47 +0100
Subject: [PATCH 3/5] fix: do not create /cache and /local_storage in docker
 images

---
 Dockerfile                              | 9 +--------
 Tests/Bench/Server/src/Dockerfile       | 4 ----
 Tests/HtcMock/Server/src/Dockerfile     | 4 ----
 Tests/Stream/Server/Dockerfile          | 4 ----
 terraform/modules/compute_plane/main.tf | 2 +-
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 04e5a59de..b4dfed7c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,6 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG VERSION=1.0.0.0
 ARG TARGETARCH
 
-RUN mkdir /cache /local_storage
-
 WORKDIR /src
 # git ls-tree -r HEAD --name-only --full-tree | grep "csproj$" | xargs -I % sh -c "export D=\$(dirname %) ; echo COPY [\\\"%\\\", \\\"\$D/\\\"]"
 COPY ["Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj", "Adaptors/Amqp/src/"]
@@ -73,9 +71,6 @@ WORKDIR /src/Control/Submitter/src
 RUN dotnet publish "ArmoniK.Core.Control.Submitter.csproj" -a $TARGETARCH --no-restore -o /app/publish/submitter /p:UseAppHost=false -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion=$VERSION -p:Version=$VERSION
 
 FROM base as polling_agent
-WORKDIR /
-COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
-COPY --from=build --chown=$APP_UID:$APP_UID /local_storage /local_storage
 WORKDIR /adapters/queue/pubsub
 COPY --from=build /app/publish/pubsub .
 WORKDIR /adapters/queue/amqp
@@ -115,8 +110,6 @@ ENTRYPOINT ["dotnet", "ArmoniK.Core.Control.PartitionMetrics.dll"]
 
 
 FROM base as submitter
-WORKDIR /
-COPY --from=build --chown=$APP_UID:$APP_UID /local_storage /local_storage
 WORKDIR /adapters/queue/pubsub
 COPY --from=build /app/publish/pubsub .
 WORKDIR /adapters/queue/amqp
@@ -131,4 +124,4 @@ ENV ASPNETCORE_URLS http://+:1080, http://+:1081
 EXPOSE 1080
 EXPOSE 1081
 
-ENTRYPOINT ["dotnet", "ArmoniK.Core.Control.Submitter.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "ArmoniK.Core.Control.Submitter.dll"]
diff --git a/Tests/Bench/Server/src/Dockerfile b/Tests/Bench/Server/src/Dockerfile
index 683d836a3..e20ce42e9 100644
--- a/Tests/Bench/Server/src/Dockerfile
+++ b/Tests/Bench/Server/src/Dockerfile
@@ -7,8 +7,6 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
-RUN mkdir /cache
-
 WORKDIR /src
 COPY ["Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj", "Tests/Bench/Server/src/"]
 RUN dotnet restore -a "${TARGETARCH}" "Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj"
@@ -17,8 +15,6 @@ WORKDIR "/src/Tests/Bench/Server/src"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.Bench.Server.csproj" -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
-WORKDIR /
-COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
 USER $APP_UID
diff --git a/Tests/HtcMock/Server/src/Dockerfile b/Tests/HtcMock/Server/src/Dockerfile
index d60399dd1..fa6fb2182 100644
--- a/Tests/HtcMock/Server/src/Dockerfile
+++ b/Tests/HtcMock/Server/src/Dockerfile
@@ -7,8 +7,6 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
-RUN mkdir /cache
-
 WORKDIR /src
 COPY ["Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj", "Tests/HtcMock/Server/src/"]
 RUN dotnet restore -a "${TARGETARCH}" "Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj"
@@ -17,8 +15,6 @@ WORKDIR "/src/Tests/HtcMock/Server/src"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.HtcMock.Server.csproj" -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
-WORKDIR /
-COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
 EXPOSE 1080
diff --git a/Tests/Stream/Server/Dockerfile b/Tests/Stream/Server/Dockerfile
index 0fa2fd390..aba212166 100644
--- a/Tests/Stream/Server/Dockerfile
+++ b/Tests/Stream/Server/Dockerfile
@@ -10,8 +10,6 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG TARGETARCH
 ARG VERSION=1.0.0.0
 
-RUN mkdir /cache
-
 WORKDIR /src
 COPY ["Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj", "Tests/Stream/Server/"]
 COPY ["Tests/Stream/Common/ArmoniK.Extensions.Common.StreamWrapper.Tests.Common.csproj", "Tests/Stream/Common/"]
@@ -22,8 +20,6 @@ WORKDIR "/src/Tests/Stream/Server"
 RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj" --no-restore -o /app/publish -p:RunAnalyzers=false -p:WarningLevel=0 -p:PackageVersion="$VERSION" -p:Version="$VERSION"
 
 FROM base AS final
-WORKDIR /
-COPY --from=build --chown=$APP_UID:$APP_UID /cache /cache
 WORKDIR /app
 COPY --from=build /app/publish .
 USER $APP_UID
diff --git a/terraform/modules/compute_plane/main.tf b/terraform/modules/compute_plane/main.tf
index 9132a58c2..c046bf247 100644
--- a/terraform/modules/compute_plane/main.tf
+++ b/terraform/modules/compute_plane/main.tf
@@ -1,7 +1,7 @@
 resource "docker_volume" "socket_vol" {
   name = "socket_vol${var.replica_counter}"
   driver_opts = {
-    o : "uid=3333"
+    o : "uid=3333,gid=3333,mode=0777"
     device : "tmpfs"
     type : "tmpfs"
   }

From 02eee565889536920301c0b43a2ce4a89161ea6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gurhem?= <jgurhem@aneo.fr>
Date: Wed, 6 Mar 2024 09:42:56 +0100
Subject: [PATCH 4/5] feat: use chiseled images for Crashing Worker

---
 Tests/CrashingWorker/Server/src/Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Tests/CrashingWorker/Server/src/Dockerfile b/Tests/CrashingWorker/Server/src/Dockerfile
index 045965f23..865870c9c 100644
--- a/Tests/CrashingWorker/Server/src/Dockerfile
+++ b/Tests/CrashingWorker/Server/src/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
 WORKDIR /app
 
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
@@ -17,8 +17,6 @@ RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.Samples.CrashingWorker.Server.csp
 FROM base AS final
 WORKDIR /app
 COPY --from=build /app/publish .
-RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --create-home --uid 5000 --gid 5000 --shell /bin/sh --skel /dev/null armonikuser
-RUN mkdir /cache && chown armonikuser: /cache
-USER armonikuser
 EXPOSE 1080
+USER $APP_UID
 ENTRYPOINT ["dotnet", "ArmoniK.Samples.CrashingWorker.Server.dll"]

From a025d1bc0a47fe886a56ebf3d53e8d1050568f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gurhem?= <jgurhem@aneo.fr>
Date: Wed, 6 Mar 2024 11:23:09 +0100
Subject: [PATCH 5/5] refactor: changing mode in volume is enough

---
 terraform/modules/compute_plane/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/modules/compute_plane/main.tf b/terraform/modules/compute_plane/main.tf
index c046bf247..545349a24 100644
--- a/terraform/modules/compute_plane/main.tf
+++ b/terraform/modules/compute_plane/main.tf
@@ -1,7 +1,7 @@
 resource "docker_volume" "socket_vol" {
   name = "socket_vol${var.replica_counter}"
   driver_opts = {
-    o : "uid=3333,gid=3333,mode=0777"
+    o : "mode=0777"
     device : "tmpfs"
     type : "tmpfs"
   }