From f2acb9e150a736391791527b98c0193abb2f870e Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Sun, 25 Jul 2021 21:09:02 +1000
Subject: [PATCH] Tweaks to s6 scripts

---
 docker/rootfs/etc/cont-init.d/01_perms.sh | 5 ++++-
 scripts/start-dev                         | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/rootfs/etc/cont-init.d/01_perms.sh b/docker/rootfs/etc/cont-init.d/01_perms.sh
index 669a0b7c..e7875d32 100755
--- a/docker/rootfs/etc/cont-init.d/01_perms.sh
+++ b/docker/rootfs/etc/cont-init.d/01_perms.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/with-contenv bash
+set -e
 
 mkdir -p /data/logs
-chown -R root:root /data/logs
\ No newline at end of file
+echo "Changing ownership of /data/logs to $(id -u):$(id -g)"
+chown -R "$(id -u):$(id -g)" /data/logs
+
diff --git a/scripts/start-dev b/scripts/start-dev
index a5e647f2..f064a4bd 100755
--- a/scripts/start-dev
+++ b/scripts/start-dev
@@ -18,10 +18,10 @@ if hash docker-compose 2>/dev/null; then
 
 	if [ "$1" == "-f" ]; then
 		echo -e "${BLUE}❯ ${YELLOW}Following Backend Container:${RESET}"
-		docker logs -f npmdev_npm_1
+		docker logs -f npm_core
 	else
 		echo -e "${YELLOW}Hint:${RESET} You can follow the output of some of the containers with:"
-		echo "  docker logs -f npmdev_npm_1"
+		echo "  docker logs -f npm_core"
 	fi
 else
 	echo -e "${RED}❯ docker-compose command is not available${RESET}"