commit 5ec1655b2ffcce953cfbf42deffeaabe2e922243
author Jakub Josef <jakub.josef@gmail.com> Fri May 05 17:58:54 2017 +0200
committer Jakub Josef <jakub.josef@gmail.com> Tue May 09 16:24:00 2017 +0200
tree e67815775af2915cd271f2d75091e5eeac6c934c
parent 35d20853f2e7f18e8ca86097b18cf028ed93751a

Added uid and gid to docker testing

Change-Id: I27446703ea7297e89e8776480a5e025f9a7eaf03

scripts/test_reclass.sh

diff --git a/scripts/test_reclass.sh b/scripts/test_reclass.sh
index a7c642f..f477007 100755
--- a/scripts/test_reclass.sh
+++ b/scripts/test_reclass.sh
@@ -12,6 +12,8 @@
 SALT_OPTS="${SALT_OPTS} --retcode-passthrough --force-color"
 DOCKER_OPTS="${DOCKER_OPTS} -e DEBIAN_FRONTEND=noninteractive"
 SKIP_CLEANUP=${SKIP_CLEANUP:-0}
+USER_ID=$(id -u)
+GROUP_ID=$(id -g)
 
 declare -a CONTAINERS
 
@@ -44,7 +46,7 @@
     log_info "Cleaning up"
 
     for container in ${CONTAINERS[@]}; do
-        CONTAINER=$container docker_exec "chown -R $(id -u):$(id -g) /srv/salt/reclass" || true
+        CONTAINER=$container docker_exec "chown -R ${USER_ID}:${GROUP_ID} /srv/salt/reclass" || true
         docker rm -f $container >/dev/null || true
     done
 
@@ -98,7 +100,7 @@
     docker_exec "for i in /usr/share/salt-formulas/reclass/service/*; do
     [ -e /srv/salt/reclass/classes/service/\$(basename \$i) ] || ln -s \$i /srv/salt/reclass/classes/service/\$(basename \$i)
     done"
-
+    docker_exec "chown -R ${USER_ID}:${GROUP_ID} /srv/salt/reclass/classes/service"
     docker_exec "[ ! -d /etc/reclass ] && mkdir /etc/reclass || true"
     docker_exec "cat << 'EOF' >> /etc/reclass/reclass-config.yml
 storage_type: yaml_fs