Docker python (#3410)

.travis.yml

@@ -156,14 +156,14 @@ env:
      - "TESTDIR=Python/django"
      - "TESTDIR=Python/falcon"
      - "TESTDIR=Python/flask"
-    # - "TESTDIR=Python/japronto"
-    # - "TESTDIR=Python/klein"
-    # - "TESTDIR=Python/morepath"
-    # - "TESTDIR=Python/pyramid"
-    # - "TESTDIR=Python/sanic"
-    # - "TESTDIR=Python/tornado"
-    # - "TESTDIR=Python/turbogears"
-    # - "TESTDIR=Python/uvicorn"
+     - "TESTDIR=Python/japronto"
+     - "TESTDIR=Python/klein"
+     - "TESTDIR=Python/morepath"
+     - "TESTDIR=Python/pyramid"
+     - "TESTDIR=Python/sanic"
+     - "TESTDIR=Python/tornado"
+     - "TESTDIR=Python/turbogears"
+     - "TESTDIR=Python/uvicorn"
     # - "TESTDIR=Python/uwsgi"
     # - "TESTDIR=Python/web2py"
     # - "TESTDIR=Python/webware"

frameworks/Python/japronto/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "japronto",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,

frameworks/Python/japronto/japronto.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /japronto
+
+WORKDIR /japronto
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /japronto/requirements.txt
+
+CMD python3 app.py

frameworks/Python/japronto/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-
-python3 app.py &

frameworks/Python/klein/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "klein",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Python/klein/klein.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python2:latest
+
+ADD ./ /klein
+
+WORKDIR /klein
+
+RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /klein/requirements.txt
+
+CMD python app.py

frameworks/Python/klein/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
-
-python app.py &

frameworks/Python/morepath/.gitignore

@@ -1,6 +0,0 @@
-.venv
-*.egg-info
-__pycache__
-.coverage
-htmlcov
-.cache

frameworks/Python/morepath/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "morepath",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Python/morepath/morepath.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /japronto
+
+WORKDIR /japronto
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /japronto/requirements.txt
+
+CMD gunicorn app.run -c gunicorn_conf.py

frameworks/Python/morepath/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-
-gunicorn app.run -c gunicorn_conf.py &

frameworks/Python/pyramid/.gitignore

@@ -1,6 +0,0 @@
-.venv
-*.egg-info
-__pycache__
-*.pt.py
-*.egg
-.coverage

frameworks/Python/pyramid/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "pyramid",
   "tests": [{
     "default": {
-      "setup_file": "setup_py3",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -26,7 +25,6 @@
       "versus": "wsgi"
     },
     "py2": {
-      "setup_file": "setup_py2",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Python/pyramid/pyramid-py2.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python2:latest
+
+ADD ./ /pyramid
+
+WORKDIR /pyramid
+
+RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /pyramid/requirements.txt
+
+CMD gunicorn wsgi:app -c gunicorn_conf.py

frameworks/Python/pyramid/pyramid.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /pyramid
+
+WORKDIR /pyramid
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /pyramid/requirements.txt
+
+CMD gunicorn wsgi:app -c gunicorn_conf.py

frameworks/Python/pyramid/setup_py2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
-
-gunicorn wsgi:app -c gunicorn_conf.py &

frameworks/Python/pyramid/setup_py3.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-
-gunicorn wsgi:app -c gunicorn_conf.py &

frameworks/Python/sanic/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "sanic",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,

frameworks/Python/sanic/sanic.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /sanic
+
+WORKDIR /sanic
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /sanic/requirements.txt
+
+CMD python3 app.py

frameworks/Python/sanic/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-
-python3 app.py &

frameworks/Python/tornado/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "tornado",
   "tests": [{
     "default": {
-      "setup_file": "setup_py2",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -26,7 +25,6 @@
       "versus": "tornado"
     },
     "pypy2": {
-      "setup_file": "setup_pypy2",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -50,7 +48,6 @@
       "versus": "tornado"
     },
     "postgresql-raw": {
-      "setup_file": "setup_pg",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -72,7 +69,6 @@
       "versus": "tornado"
     },
     "py3": {
-      "setup_file": "setup_py3",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Python/tornado/setup_pg.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements_pg.txt
-
-python server_pg.py --port=8080 --postgres=$DBHOST --logging=error &

frameworks/Python/tornado/setup_py2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements_mongo.txt
-
-python server_py2.py --port=8080 --mongo=$DBHOST --logging=error &

frameworks/Python/tornado/setup_py3.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements_mongo.txt
-
-python3 server_py3.py --port=8080 --mongo=$DBHOST --logging=error &

frameworks/Python/tornado/setup_pypy2.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb pypy2
-
-pip install --install-option="--prefix=${PYPY2_ROOT}" -r $TROOT/requirements_mongo.txt
-
-pypy server_py2.py --port=8080 --mongo=$DBHOST --logging=error &

frameworks/Python/tornado/tornado-postgresql-raw.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python2:latest
+
+ADD ./ /tornado
+
+WORKDIR /tornado
+
+RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /tornado/requirements_pg.txt
+
+CMD python server_pg.py --port=8080 --postgres=$DBHOST --logging=error

frameworks/Python/tornado/tornado-py3.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /pyramid
+
+WORKDIR /pyramid
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /pyramid/requirements_mongo.txt
+
+CMD python3 server_py3.py --port=8080 --mongo=$DBHOST --logging=error

frameworks/Python/tornado/tornado-pypy2.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/pypy2:latest
+
+ADD ./ /tornado
+
+WORKDIR /tornado
+
+RUN pip install --install-option="--prefix=${PYPY2_ROOT}" -r /tornado/requirements_mongo.txt
+
+CMD pypy server_py2.py --port=8080 --mongo=$DBHOST --logging=error

frameworks/Python/tornado/tornado.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python2:latest
+
+ADD ./ /tornado
+
+WORKDIR /tornado
+
+RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /tornado/requirements_mongo.txt
+
+CMD python server_py2.py --port=8080 --mongo=$DBHOST --logging=error

frameworks/Python/turbogears/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "turbogears",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Python/turbogears/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql python2
-
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
-
-gunicorn app:app -c gunicorn_conf.py &

frameworks/Python/turbogears/turbogears.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python2:latest
+
+ADD ./ /turbogears
+
+WORKDIR /turbogears
+
+RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /turbogears/requirements.txt
+
+CMD gunicorn app:app -c gunicorn_conf.py

frameworks/Python/uvicorn/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "uvicorn",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "fortune_url": "/fortunes",
       "plaintext_url": "/plaintext",

frameworks/Python/uvicorn/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql python3
-
-pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
-
-uvicorn app:main -c uvicorn_conf.py &

frameworks/Python/uvicorn/uvicorn.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/python3:latest
+
+ADD ./ /uvicorn
+
+WORKDIR /uvicorn
+
+RUN pip3 install --install-option="--prefix=${PY3_ROOT}" -r /uvicorn/requirements.txt
+
+CMD uvicorn app:main -c uvicorn_conf.py