From c9f489666220c1b919c0ac04a819ff0f3462225a Mon Sep 17 00:00:00 2001
From: hackerman <3372410+aeneasr@users.noreply.github.com>
Date: Sat, 11 Jan 2025 13:31:09 +0100
Subject: [PATCH] Revert "chore: Revise scratch image"

This reverts commit 19ce7f1addff17558ffcb735d1605fb5400f1bb6.
---
 .docker/Dockerfile-scratch | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.docker/Dockerfile-scratch b/.docker/Dockerfile-scratch
index 1ab2f8b3a45..e9798de37e5 100644
--- a/.docker/Dockerfile-scratch
+++ b/.docker/Dockerfile-scratch
@@ -1,28 +1,20 @@
-FROM alpine:3.20 AS base-files
+FROM alpine:3.20
 
-RUN <<HEREDOC
-    apk upgrade --no-cache
+RUN apk upgrade --no-cache && \
     apk add --no-cache --upgrade ca-certificates
 
-    # Add a user/group for Ory with a stable UID + GID:
-    addgroup --system --gid 500 ory
-    adduser --system --uid 500 \
-      --gecos "Ory User" \
-      --home /home/ory \
-      --ingroup ory \
-      --shell /sbin/nologin \
-      ory
+RUN addgroup -S ory; \
+    adduser -S ory -G ory -D  -h /home/ory -s /bin/nologin;
 
-    # Create the sqlite directory with ownership to that user and group:
-    install --owner ory --group ory --directory /var/lib/sqlite
-HEREDOC
+RUN mkdir -p /var/lib/sqlite && \
+    chown -R ory:ory /var/lib/sqlite
 
 FROM scratch
-COPY --from=base-files /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=base-files /etc/nsswitch.conf /etc/nsswitch.conf
-# NOTE: /etc/group and /etc/shadow were not copied over, only user lookup is valid for `USER`:
-COPY --from=base-files /etc/passwd /etc/passwd
-COPY --from=base-files /var/lib/sqlite /var/lib/sqlite
+
+COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=0 /etc/nsswitch.conf /etc/nsswitch.conf
+COPY --from=0 /etc/passwd /etc/passwd
+COPY --from=0 /var/lib/sqlite /var/lib/sqlite
 
 COPY hydra /usr/bin/hydra