Make dockerfiles a bit more consistent

... and add Mint 19 and CentOS 6. The latter currently fails in
ctng's configure due to an old libtool; need to make libtool
optional.

Signed-off-by: Alexey Neyman <stilor@att.net>

4 files changed, 10 insertions, 27 deletions

diff --git a/testing/docker/common-scripts/ctng-build-sample b/testing/docker/common-scripts/ctng-build-sample
index 3f21478..6a6de6a 100755
--- a/testing/docker/common-scripts/ctng-build-sample
+++ b/testing/docker/common-scripts/ctng-build-sample
@@ -2,8 +2,8 @@
 
 set -e
 cd
-rm -rf bld-samples
-mkdir bld-samples
-cd bld-samples
-export PATH=$HOME/inst-ctng/bin:$PATH
-ct-ng build-all ${1+CT_SAMPLES="$*"}
+rm -rf work/bld-samples
+mkdir -p work/bld-samples work/inst-xtools
+cd work/bld-samples
+export PATH=$HOME/work/inst-ctng/bin:$PATH
+ct-ng build-all CT_PREFIX=$HOME/work/inst-xtools ${1+CT_SAMPLES="$*"}
diff --git a/testing/docker/common-scripts/ctng-install b/testing/docker/common-scripts/ctng-install
index f29093a..500cb73 100755
--- a/testing/docker/common-scripts/ctng-install
+++ b/testing/docker/common-scripts/ctng-install
@@ -2,9 +2,9 @@
 
 set -e
 cd
-rm -rf bld-ctng
-mkdir bld-ctng
-cd bld-ctng
-/crosstool-ng/configure --prefix=$HOME/inst-ctng
+rm -rf work/bld-ctng work/inst-ctng
+mkdir work/bld-ctng
+cd work/bld-ctng
+/crosstool-ng/configure --prefix=$HOME/work/inst-ctng
 make
 make install
diff --git a/testing/docker/common-scripts/ctng-test-basic b/testing/docker/common-scripts/ctng-test-basic
index 75412e1..0edb899 100755
--- a/testing/docker/common-scripts/ctng-test-basic
+++ b/testing/docker/common-scripts/ctng-test-basic
@@ -2,7 +2,7 @@
 
 set -e
 cd
-export PATH=$HOME/inst-ctng/bin:$PATH
+export PATH=$HOME/work/inst-ctng/bin:$PATH
 ct-ng help
 ct-ng list-samples
 ct-ng list-steps
diff --git a/testing/docker/common-scripts/su-as-user b/testing/docker/common-scripts/su-as-user
deleted file mode 100755
index 436eb54..0000000
--- a/testing/docker/common-scripts/su-as-user
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-usr=$1
-uid=$2
-grp=$3
-gid=$4
-shift 4
-
-groupadd -g ${gid} ${grp}
-useradd -d /home/${usr} -m -g ${gid} -u ${uid} ${usr}
-rm -f /home/${usr}/src
-ln -sf /src /home/${usr}/src
-if [ -z "$*" ]; then
-    exec su -l ${usr}
-else
-    exec su -l -c "/bin/bash -c '$*'" ${usr}
-fi