From 4c67752e750474522ab1e14ef53082d33c7c1e34 Mon Sep 17 00:00:00 2001
From: Toan Hoang <toan@hoanglai.no>
Date: Mon, 12 Dec 2016 13:13:21 +0100
Subject: [PATCH 1/2] Added support for custom UID/GID by using enviroment
 variables PUID/PGID

---
 Dockerfile           | 4 +---
 docker-entrypoint.sh | 6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f975af94..0679b290 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,6 @@
 # https://github.com/nodejs/LTS
 FROM node:4-slim
 
-RUN groupadd user && useradd --create-home --home-dir /home/user -g user user
-
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
 RUN set -x \
@@ -38,7 +36,7 @@ RUN buildDeps=' \
 	&& rm -rf /tmp/npm*
 
 ENV GHOST_CONTENT /var/lib/ghost
-RUN mkdir -p "$GHOST_CONTENT" && chown -R user:user "$GHOST_CONTENT"
+RUN mkdir -p "$GHOST_CONTENT"
 VOLUME $GHOST_CONTENT
 
 COPY docker-entrypoint.sh /entrypoint.sh
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ec7842f4..3962259f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -20,7 +20,11 @@ if [[ "$*" == npm*start* ]]; then
 
 	ln -sf "$GHOST_CONTENT/config.js" "$GHOST_SOURCE/config.js"
 
-	chown -R user "$GHOST_CONTENT"
+        PUID=${PUID:-1001}
+        PGID=${PGID:-1001}
+        groupadd -o -g "$PGID" user && useradd --create-home --home-dir /home/user -g user -o -u "$PUID" user
+
+	chown -R user:user "$GHOST_CONTENT"
 
 	set -- gosu user "$@"
 fi

From a9cda98852f41865a00f53a6a6d75e7faa5f8e13 Mon Sep 17 00:00:00 2001
From: Toan Hoang <toan@hoanglai.no>
Date: Mon, 12 Dec 2016 13:31:39 +0100
Subject: [PATCH 2/2] Cleanup

---
 docker-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 3962259f..a941aa9c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -22,7 +22,8 @@ if [[ "$*" == npm*start* ]]; then
 
         PUID=${PUID:-1001}
         PGID=${PGID:-1001}
-        groupadd -o -g "$PGID" user && useradd --create-home --home-dir /home/user -g user -o -u "$PUID" user
+        groupadd -o -g "$PGID" user
+        useradd --create-home --home-dir /home/user -g user -o -u "$PUID" user
 
 	chown -R user:user "$GHOST_CONTENT"