Merge pull request #3718 from dokku/3714-python-support

Detect correct python binary to use

debian/postinst

@@ -92,6 +92,12 @@ setup-dokku-installer() {
   NGINX_ROOT="/etc/nginx"
   [[ -x /usr/bin/openresty ]] && NGINX_ROOT="/usr/local/openresty/nginx/conf"
 
+  if command -v "python3" &>/dev/null; then
+    sed -i '1 s/^.*$/#!\/usr\/bin\/env python3/' /usr/share/dokku/contrib/dokku-installer.py
+  elif command -v "python2.7" &>/dev/null; then
+    sed -i '1 s/^.*$/#!\/usr\/bin\/env python2.7/' /usr/share/dokku/contrib/dokku-installer.py
+  fi
+
   if [[ -f "$NGINX_ROOT/conf.d/dokku-installer.conf" ]]; then
     echo "Setting up dokku-installer"
     /usr/share/dokku/contrib/dokku-installer.py onboot

plugins/scheduler-docker-local/scheduler-inspect

@@ -48,7 +48,15 @@ EOF
   for CONTAINER_FILE in $CONTAINER_FILES; do
     CIDS+="$(<"$DOKKU_ROOT/$APP/$CONTAINER_FILE")"
   done
-  "$DOCKER_BIN" container inspect "${CIDS[@]}" | python2.7 "$TMP_INSPECT_CMD"
+
+  local PYTHON_BIN=python
+  if command -v "python3" &>/dev/null; then
+    PYTHON_BIN=python3
+  elif command -v "python2.7" &>/dev/null; then
+    PYTHON_BIN=python2.7
+  fi
+
+  "$DOCKER_BIN" container inspect "${CIDS[@]}" | "$PYTHON_BIN" "$TMP_INSPECT_CMD"
 
 }