From b68766d84b9be42600395a86aef820232b5e8709 Mon Sep 17 00:00:00 2001
From: oznu <dev@oz.nu>
Date: Fri, 18 Jan 2019 20:37:58 +1100
Subject: [PATCH] 0.13.2

---
 Dockerfile                       | 6 +++---
 Dockerfile.raspberry-pi          | 6 +++---
 root/etc/cont-init.d/40-prepare  | 6 +++---
 root/etc/cont-init.d/50-postgres | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b43b89..6f2b28f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Multi-stage build - See https://docs.docker.com/engine/userguide/eng-image/multistage-build
-FROM ubnt/unms:0.13.1 as unms
-FROM ubnt/unms-netflow:0.13.1 as unms-netflow
-FROM oznu/s6-node:10.13.0-r2-debian-amd64
+FROM ubnt/unms:0.13.2 as unms
+FROM ubnt/unms-netflow:0.13.2 as unms-netflow
+FROM oznu/s6-node:10.15.0-debian-amd64
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/Dockerfile.raspberry-pi b/Dockerfile.raspberry-pi
index ba2a389..362025e 100644
--- a/Dockerfile.raspberry-pi
+++ b/Dockerfile.raspberry-pi
@@ -1,7 +1,7 @@
 # Multi-stage build - See https://docs.docker.com/engine/userguide/eng-image/multistage-build
-FROM ubnt/unms:0.13.1 as unms
-FROM ubnt/unms-netflow:0.13.1 as unms-netflow
-FROM oznu/s6-node:10.13.0-r2-debian-armhf
+FROM ubnt/unms:0.13.2 as unms
+FROM ubnt/unms-netflow:0.13.2 as unms-netflow
+FROM oznu/s6-node:10.15.0-debian-armhf
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/root/etc/cont-init.d/40-prepare b/root/etc/cont-init.d/40-prepare
index 503c772..fced009 100644
--- a/root/etc/cont-init.d/40-prepare
+++ b/root/etc/cont-init.d/40-prepare
@@ -19,14 +19,14 @@ ln -s /config/cert /cert
 
 # UNMS Logs
 [ -e /config/unms/logs ] || mkdir -p /config/unms/logs
-chown -R nobody:nobody /config/unms/logs
+chown -R nobody:nogroup /config/unms/logs
 
 # Service Logs
 [ -e /config/logs ] || mkdir -p /config/logs
-chown -R nobody:nobody /config/logs
+chown -R nobody:nogroup /config/logs
 
 # Clean cron
-[ -f /var/run/crond.pid ] rm -rf /var/run/crond.pid
+[ -f /var/run/crond.pid ] && rm -rf /var/run/crond.pid
 
 # Fix hosts file
 echo "127.0.0.1 unms" >> /etc/hosts
diff --git a/root/etc/cont-init.d/50-postgres b/root/etc/cont-init.d/50-postgres
index 0534a38..4dd8e83 100644
--- a/root/etc/cont-init.d/50-postgres
+++ b/root/etc/cont-init.d/50-postgres
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv sh
 
-mkdir -p /config/postgres /run/postgresql
-chown -R postgres:postgres /config/postgres /run/postgresql
+mkdir -p /config/postgres /run/postgresql /var/run/postgresql
+chown -R postgres:postgres /config/postgres /run/postgresql /var/run/postgresql
 chmod 0700 /config/postgres
 
 if [ -e /config/postgres/postgresql.conf ]; then