Merge branch 'develop' of github.com:rosette-api/python into develop

Author: fhasanaj28

docker/Dockerfile

@@ -11,25 +11,25 @@ RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
 
 RUN apt-get update && \
-    apt-get -y install \
+    	apt-get -y install \
         wget \
         libssl-dev \
         libffi-dev \
         python-pip \
         python-software-properties \
         software-properties-common && \
-    add-apt-repository -y ppa:fkrull/deadsnakes && \
-    apt-get update && \
-    apt-get -y install \
+    	add-apt-repository -y ppa:fkrull/deadsnakes && \
+    	apt-get update && \
+    	apt-get -y install \
         python2.6 \
         python2.7 \
         python3.3 \
         python3.4 \
         python3.5 \
         git\
         pypy && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    	apt-get clean && \
+    	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN mkdir /install && \
     wget -O /install/pypy3-2.4-linux_x86_64-portable.tar.bz2 \

docker/run_python.sh

@@ -58,14 +58,14 @@ if [ ! -z ${API_KEY} ]; then
     cd /python-dev/examples
     if [ ! -z ${FILENAME} ]; then
         if [ ! -z ${ALT_URL} ]; then
-	    python ${FILENAME} --key ${API_KEY} --url ${ALT_URL} 
-	else
-	    python ${FILENAME} --key ${API_KEY} 
-   	fi
+            python ${FILENAME} --key ${API_KEY} --url ${ALT_URL}
+        else
+            python ${FILENAME} --key ${API_KEY}
+        fi
     elif [ ! -z ${ALT_URL} ]; then
-    	find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} --url ${ALT_URL} \;
+        find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} --url ${ALT_URL} \;
     else
-	find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} \;
+        find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} \;
     fi
 else 
     HELP

examples/docker/Dockerfile

@@ -2,13 +2,13 @@ FROM python:2.7.11
 MAINTAINER Fiona Hasanaj
 
 # install necessary software
-RUN apt-get -y update && apt-get install -y vim  && apt-get install -y git && pip install tox
+RUN apt-get -y update && apt-get install -y vim  && apt-get install -y git && pip install rosette_api
 
 COPY run_python.sh /python/examples/run_python.sh
 RUN chmod 755 /python/examples/run_python.sh
 WORKDIR /python/examples
 
 # allow interactive bash inside docker container
-CMD ./run_python.sh $API_KEY $ALT_URL
+CMD ./run_python.sh $API_KEY $FILENAME $ALT_URL
 
 VOLUME ["/source"]

examples/docker/run_python.sh

@@ -17,14 +17,14 @@ while getopts ":API_KEY:FILENAME:ALT_URL" arg; do
             API_KEY=${OPTARG}
             usage
             ;;
-        ALT_URL)
-            ALT_URL=${OPTARG}
-            usage
-            ;;
         FILENAME)
             FILENAME=${OPTARG}
             usage
             ;;
+        ALT_URL)
+            ALT_URL=${OPTARG}
+            usage
+            ;;
     esac
 done
 
@@ -37,22 +37,22 @@ function checkAPI {
     fi  
 }
 
-#Copy the mounted content in /source to current WORKDIR
-cp /source/*.* .
+#Copy the examples from the mounted content in /source to current WORKDIR
+cp  /source/examples/*.* .
 
 #Run the examples
 if [ ! -z ${API_KEY} ]; then
     checkAPI
     if [ ! -z ${FILENAME} ]; then
         if [ ! -z ${ALT_URL} ]; then
-	    tox -- ${FILENAME} --key ${API_KEY} --url ${ALT_URL} 
+	    python ${FILENAME} --key ${API_KEY} --url ${ALT_URL} 
 	else
-	    tox -- ${FILENAME} --key ${API_KEY} 
+	    python ${FILENAME} --key ${API_KEY} 
    	fi
     elif [ ! -z ${ALT_URL} ]; then
-    	find -maxdepth 1  -name '*.py' -print -exec tox -- {} --key ${API_KEY} --url ${ALT_URL} \;
+    	find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} --url ${ALT_URL} \;
     else
-	find -maxdepth 1  -name '*.py' -print -exec tox -- {} --key ${API_KEY} \;
+	find -maxdepth 1  -name '*.py' -print -exec python {} --key ${API_KEY} \;
     fi
 else 
     HELP