[libgda] Docker scripts: enable using either "sudo docker" or "docker" directly

[Vivien Malerba <vivien src gnome org>]

commit 00b552773d54431f832077e70a1580ab4b3a9772
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Dec 13 22:07:33 2014 +0100

    Docker scripts: enable using either "sudo docker" or "docker" directly

 docker-tools/ldap-test-server/build.sh       |    6 ++++--
 docker-tools/mingw-32-cross-compil/build.sh  |    6 ++++--
 docker-tools/mingw-64-cross-compil/build.sh  |    6 ++++--
 docker-tools/postgresql-test-server/build.sh |    6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/docker-tools/ldap-test-server/build.sh b/docker-tools/ldap-test-server/build.sh
index 49e17c4..d7962fa 100755
--- a/docker-tools/ldap-test-server/build.sh
+++ b/docker-tools/ldap-test-server/build.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+docker_cmd="sudo docker"
+#docker_cmd="docker"
 image_name="libgda-test-ldap"
 
 # test docker install
-docker version > /dev/null 2>&1 || {
+$docker_cmd version > /dev/null 2>&1 || {
     echo "Can't find or execute docker"
     exit 1
 }
@@ -16,7 +18,7 @@ echo "Generating LDAP directory contents"
 }
 
 echo "Now building Docker image, this will take a few minutes (or maybe half an hour, depending on you 
setup)..."
-docker build --force-rm -q -t "$image_name" . || {
+$docker_cmd build --force-rm -q -t "$image_name" . || {
     echo "Failed to build image."
     exit 1
 }
diff --git a/docker-tools/mingw-32-cross-compil/build.sh b/docker-tools/mingw-32-cross-compil/build.sh
index 86cb747..4a3d1aa 100755
--- a/docker-tools/mingw-32-cross-compil/build.sh
+++ b/docker-tools/mingw-32-cross-compil/build.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+#docker_cmd="sudo docker"
+docker_cmd="docker"
 image_name="libgda-mingw32"
 
 # test docker install
-docker version > /dev/null 2>&1 || {
+$docker_cmd version > /dev/null 2>&1 || {
     echo "Can't find or execute docker"
     exit 1
 }
@@ -28,7 +30,7 @@ fi
 
 # build image
 echo "Now building Docker image, this will take a few minutes (or maybe half an hour, depending on you 
setup)..."
-docker build --force-rm -q -t "$image_name" . || {
+$docker_cmd build --force-rm -q -t "$image_name" . || {
     echo "Failed to build image."
     exit 1
 }
diff --git a/docker-tools/mingw-64-cross-compil/build.sh b/docker-tools/mingw-64-cross-compil/build.sh
index 9eca2b6..ed89668 100755
--- a/docker-tools/mingw-64-cross-compil/build.sh
+++ b/docker-tools/mingw-64-cross-compil/build.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+#docker_cmd="sudo docker"
+docker_cmd="docker"
 image_name="libgda-mingw64"
 
 # test docker install
-docker version > /dev/null 2>&1 || {
+$docker_cmd version > /dev/null 2>&1 || {
     echo "Can't find or execute docker"
     exit 1
 }
@@ -28,7 +30,7 @@ fi
 
 # build image
 echo "Now building Docker image, this will take a few minutes (or maybe half an hour, depending on you 
setup)..."
-docker build --force-rm -q -t "$image_name" . || {
+$docker_cmd build --force-rm -q -t "$image_name" . || {
     echo "Failed to build image."
     exit 1
 }
diff --git a/docker-tools/postgresql-test-server/build.sh b/docker-tools/postgresql-test-server/build.sh
index 42a89a7..e8167ac 100755
--- a/docker-tools/postgresql-test-server/build.sh
+++ b/docker-tools/postgresql-test-server/build.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+#docker_cmd="sudo docker"
+docker_cmd="docker"
 image_name="libgda-test-postgresql"
 
 # test docker install
-docker version > /dev/null 2>&1 || {
+$docker_cmd version > /dev/null 2>&1 || {
     echo "Can't find or execute docker"
     exit 1
 }
@@ -23,7 +25,7 @@ then
 fi
 
 echo "Now building Docker image, this will take a few minutes (or maybe half an hour, depending on you 
setup)..."
-docker build --force-rm -t "$image_name" . || {
+$docker_cmd build --force-rm -q -t "$image_name" . || {
     echo "Failed to build image."
     exit 1
 }