cli: better choosing between local, docker and local-in-docker cli

packages/cli/Dockerfile

@@ -20,5 +20,6 @@ RUN curl -Ls "https://download.docker.com/linux/debian/dists/stretch/pool/stable
 
 COPY --from=builder /src/packages/cli/dist/src /opt/contember/dist/src
 COPY --from=builder /src/packages/cli/node_modules /opt/contember/node_modules
+COPY --from=builder /src/packages/cli/run.sh /opt/contember/run.sh
 
-ENTRYPOINT ["node", "/opt/contember/dist/src/run.js"]
+ENTRYPOINT ["bash", "/opt/contember/run.sh"]

packages/cli/contember-docker.sh

@@ -4,11 +4,10 @@ IFS=$'\n\t'
 
 IMAGE="contember/cli:latest"
 
-if [[ -f "`pwd`/node_modules/.bin/contember" ]]; then
+if [[ -f "`pwd`/node_modules/.bin/contember" && -x "$(command -v npx)" ]]; then
 	echo "Using local Contember CLI"
 	npx contember "$@"
 else
-	echo "Using docker Contember CLI"
 	docker run -ti --network host --rm \
 	  -v "$(pwd)":/src -v /var/run/docker.sock:/var/run/docker.sock \
 	  "$IMAGE" "$@"

packages/cli/run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -euo pipefail
+
+if [[ -f "`pwd`/node_modules/.bin/contember" ]]; then
+	echo "Using local Contember CLI"
+	npx contember "$@"
+else
+	node /opt/contember/dist/src/run.js "$@"
+fi
+