Simplify runtime configuration, add python3.6 and python3.7 in cmd.sh

Author: AlexisNo

cmd.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-if [ "$RUNTIME" == "python" ] || [ "$RUNTIME" == "python2" ]; then
+if [ "$RUNTIME" == "python" ] || [ "$RUNTIME" == "python2" ] || [ "$RUNTIME" == "python2.7" ]; then
     su $DEFAULT_USER -c "pip install --requirement requirements.txt --upgrade --target ."
-elif [ "$RUNTIME" == "python3" ]; then
+elif [ "$RUNTIME" == "python3" ] || [ "$RUNTIME" == "python3.6" ] || [ "$RUNTIME" == "python3.7" ]; then
     su $DEFAULT_USER -c "pip3 install --requirement requirements.txt --upgrade --target ."
 else
     su $DEFAULT_USER -c "npm install --production"

entrypoint.sh

@@ -2,49 +2,21 @@
 set -e
 
 if [ `whoami` == "root" ]; then
-
-    if [ "$RUNTIME" == "" ]; then
-        echo "Using default runtime node v8"
-    fi
-
-    if [ "$RUNTIME" == "node" ]; then
-        echo "Using default node v8 runtime"
-    fi
-    
-    if [ "$RUNTIME" == "node6" ]; then
-        echo "Setting node runtime to v6"
+    if [ "$RUNTIME" == "python" ] || [ "$RUNTIME" == "python2" ] || [ "$RUNTIME" == "python2.7" ]; then
+        echo "Using python v2.7 runtime"
+    elif [ "$RUNTIME" == "python3" ] || [ "$RUNTIME" == "python3.7" ]; then
+        echo "Using python v3.7 runtime"
+    elif [ "$RUNTIME" == "python3.6" ]; then
+        echo "Using python v3.6 runtime"
+        ln -sf /opt/python-${PYTHON_VERSION_3_6}/bin/python3 /usr/bin/python3
+        ln -sf /opt/python-${PYTHON_VERSION_3_6}/bin/pip3 /usr/bin/pip3
+    elif [ "$RUNTIME" == "node6" ]; then
+        echo "Using node v6 runtime"
         rm /usr/local/bin/node /usr/local/bin/npm
         ln -sf /opt/node-v${NODE_VERSION_6}-linux-x64/bin/node /usr/local/bin/node
         ln -sf /opt/node-v${NODE_VERSION_6}-linux-x64/bin/npm /usr/local/bin/npm
-    fi
-
-    if [ "$RUNTIME" == "node8" ]; then
-        echo "Setting node runtime to v8"
-        rm /usr/local/bin/node /usr/local/bin/npm
-        ln -sf /opt/node-v${NODE_VERSION_8}-linux-x64/bin/node /usr/local/bin/node
-        ln -sf /opt/node-v${NODE_VERSION_8}-linux-x64/bin/npm /usr/local/bin/npm
-    fi
-
-    if [ "$RUNTIME" == "python" ]; then
-        echo "Using default python v2 runtime"
-        ln -sf /usr/bin/python2.7 /usr/bin/python2
-    fi
-
-    if [ "$RUNTIME" == "python2" ]; then
-        echo "Setting python runtime to 2"
-        ln -sf /usr/bin/python2.7 /usr/bin/python2
-    fi
-
-    if [ "$RUNTIME" == "python3.6" ]; then
-        echo "Setting python runtime to 3.6"
-        ln -sf /opt/python-${PYTHON_VERSION_3_6}/bin/python3 /usr/bin/python3
-        ln -sf f/opt/python-${PYTHON_VERSION_3_6}/bin/pip3 /usr/bin/pip3
-    fi
-
-    if [ "$RUNTIME" == "python3.7" ]; then
-        echo "Setting python runtime to 3.7"
-        ln -sf /opt/python-${PYTHON_VERSION_3_7}/bin/python3 /usr/bin/python3
-        ln -sf /opt/python-${PYTHON_VERSION_3_7}/bin/pip3 /usr/bin/pip3
+    else
+        echo "Using node v8 runtime"
     fi
 
     if [ "$HOST_UID" != "" ]; then