From b1142db34a12537a2f8bdad441b2d246b0e40536 Mon Sep 17 00:00:00 2001
From: Jeroen Boersma <jeroen@srcode.nl>
Date: Wed, 12 Jul 2017 10:10:23 +0200
Subject: [PATCH] Make sure UID/GID are set correctly

* learned that ARG in Dockerfile doesn't accept ENV vars to overwrite
  without the --build-arg, now this is done correctly
---
 bin/dev_command/build | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/bin/dev_command/build b/bin/dev_command/build
index c81656c..38b85ef 100644
--- a/bin/dev_command/build
+++ b/bin/dev_command/build
@@ -1,5 +1,23 @@
 
-dc yml_all
-dc mode build
-dc cmd "$*";
+services=`main config --services`;
+
+user_id=`id -u`;
+group_id=`id -g`;
+
+if [ -n "${user_id}" ]; then
+    userarg='--build-arg=UID='${user_id};
+fi
+if [ -n "${group_id}" ]; then
+    grouparg='--build-arg=GID='${group_id};
+fi
+
+dc yml_all;
+dc mode build;
+dc cmd "${userarg} ${grouparg} $@";
+
+for a in ${services}; do
+    cmd="`dc show` $a";
+    ${cmd};
+done
+exit;