From f281e04718667e3941f4fc145687eef6d32c5714 Mon Sep 17 00:00:00 2001
From: Dave Baird <dave@zerofive.co.uk>
Date: Sun, 4 Apr 2021 17:36:40 +0200
Subject: [PATCH 1/2] Generate output files under configurable ID, e.g. as the
 current (host) user

---
 .dockerignore | 1 +
 Dockerfile    | 9 +++++++--
 entrypoint    | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 entrypoint

diff --git a/.dockerignore b/.dockerignore
index 79462806..6c38f4eb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,3 +6,4 @@
 !rollup.config.js
 !tsconfig.json
 !yarn.lock
+!entrypoint
diff --git a/Dockerfile b/Dockerfile
index a28fd2cc..14c1f0aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,8 @@ RUN apk update && apk upgrade && \
       font-noto-devanagari@edge \
       font-noto-arabic@edge \
       font-noto-bengali@edge \
-      nss@edge
+      nss@edge \
+      su-exec
 
 RUN addgroup -S marp && adduser -S -g marp marp \
     && mkdir -p /home/marp/app /home/marp/.cli \
@@ -31,6 +32,10 @@ RUN yarn add puppeteer-core@chrome-$(chromium-browser --version | sed -r 's/^Chr
 RUN yarn install && yarn build && rm -rf ./src ./node_modules && yarn install --production && yarn cache clean \
     && node /home/marp/.cli/marp-cli.js --version
 
+USER root
+
+ENV MARPID marp:marp
+
 WORKDIR /home/marp/app
-ENTRYPOINT ["node", "/home/marp/.cli/marp-cli.js"]
+ENTRYPOINT ["/home/marp/.cli/entrypoint"]
 CMD ["--help"]
diff --git a/entrypoint b/entrypoint
new file mode 100755
index 00000000..b8152c0e
--- /dev/null
+++ b/entrypoint
@@ -0,0 +1,3 @@
+#!/bin/ash
+
+exec su-exec "$MARPID" node /home/marp/.cli/marp-cli.js "$@"

From 501b1bf8934a4d74831f6352dea8bf53b7d19c8c Mon Sep 17 00:00:00 2001
From: Dave Baird <dave@zerofive.co.uk>
Date: Mon, 5 Apr 2021 15:02:54 +0200
Subject: [PATCH 2/2] Better var name

---
 Dockerfile | 2 +-
 entrypoint | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 14c1f0aa..708a10f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ RUN yarn install && yarn build && rm -rf ./src ./node_modules && yarn install --
 
 USER root
 
-ENV MARPID marp:marp
+ENV MARP_USER marp:marp
 
 WORKDIR /home/marp/app
 ENTRYPOINT ["/home/marp/.cli/entrypoint"]
diff --git a/entrypoint b/entrypoint
index b8152c0e..ee39f74d 100755
--- a/entrypoint
+++ b/entrypoint
@@ -1,3 +1,3 @@
 #!/bin/ash
 
-exec su-exec "$MARPID" node /home/marp/.cli/marp-cli.js "$@"
+exec su-exec "$MARP_USER" node /home/marp/.cli/marp-cli.js "$@"