From 6047684086201aa89b522548cab89b04bac2c075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADn?= <gmartin@gmartin.net>
Date: Wed, 29 May 2024 11:41:13 +0200
Subject: [PATCH] Use writefreely user

---
 Dockerfile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e7212e6..f09c749 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.source="https://github.com/writefreely/writefreel
 LABEL org.opencontainers.image.description="WriteFreely is a clean, minimalist publishing platform made for writers. Start a blog, share knowledge within your organization, or build a community around the shared act of writing."
 
 ARG WRITEFREELY_VERSION=v0.15.0
-ARG WRITEFREELY_FORK=writeas/writefreely
+ARG WRITEFREELY_FORK=writefreely/writefreely
 
 RUN apk -U upgrade \
     && apk add --no-cache nodejs npm make g++ git sqlite-dev \
@@ -38,14 +38,23 @@ RUN mkdir /stage && \
 # Final image
 FROM alpine:3.19
 
+ARG WRITEFREELY_UID=1000
+ARG WRITEFREELY_GID=1000
+
 RUN apk -U upgrade && apk add --no-cache openssl ca-certificates
+
+RUN addgroup -g ${WRITEFREELY_GID} -S writefreely && adduser -u ${WRITEFREELY_UID} -S -G writefreely writefreely
+
 COPY --from=build --chown=daemon:daemon /stage /writefreely
 COPY bin/writefreely-docker.sh /writefreely/
 
 WORKDIR /writefreely
 VOLUME /data
 EXPOSE 8080
-USER daemon
+
+RUN chown -R writefreely:writefreely /writefreely
+
+USER writefreely
 
 ENTRYPOINT ["/writefreely/writefreely-docker.sh"]