From a31f2a8840843bd4be648bbf96a6881ad2208bf9 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 27 Mar 2020 14:25:03 +0100
Subject: [PATCH] Fix folder creation (#62)

---
 CHANGELOG.md                           | 4 ++++
 Dockerfile                             | 3 +--
 rootfs/etc/cont-init.d/02-fix-perms.sh | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cb576e..2b49fd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.61-RC4 (2020/03/27)
+
+* Fix folder creation (#62)
+
 ## 1.61-RC3 (2020/03/22)
 
 * Allow multi discovery workers through `LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS` env var (#59)
diff --git a/Dockerfile b/Dockerfile
index b007292..0fac21b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -115,8 +115,7 @@ RUN mkdir -p /opt \
 COPY rootfs /
 
 RUN addgroup -g ${PGID} librenms \
-  && adduser -D -h ${LIBRENMS_PATH} -u ${PUID} -G librenms -s /bin/sh -D librenms \
-  && mkdir -p /data /var/run/nginx /var/run/php-fpm
+  && adduser -D -h ${LIBRENMS_PATH} -u ${PUID} -G librenms -s /bin/sh -D librenms
 
 EXPOSE 8000 514 514/udp
 WORKDIR ${LIBRENMS_PATH}
diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh
index bf334f1..e763d7d 100644
--- a/rootfs/etc/cont-init.d/02-fix-perms.sh
+++ b/rootfs/etc/cont-init.d/02-fix-perms.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/with-contenv sh
 
 echo "Fixing perms..."
+mkdir -p /data \
+  /var/run/nginx \
+  /var/run/php-fpm
 chown librenms. \
   /data \
   "${LIBRENMS_PATH}"