Commit 932e5bb68a603885e4bd9cf1bd5146542f736ccf

Anthony Green 2019-11-24T16:26:14

Force the use of docker

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/.travis/build.sh b/.travis/build.sh
index c134f57..a0cfcef 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -8,15 +8,7 @@ else
     export SET_QEMU_CPU="-e QEMU_CPU=${QEMU_CPU}"
 fi
 
-# Default to podman where available, docker otherwise.
-# Override by setting the DOCKER environment variable.
-if test -z "$DOCKER"; then
-  if command -v podman > /dev/null; then
-    export DOCKER=docker
-  else
-    export DOCKER=podman
-  fi
-fi
+export DOCKER=docker
 
 function build_cfarm()
 {