diff --git a/Dockerfile b/Dockerfile index 43e7429b..6a9bcb37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,35 @@ MAINTAINER KBase Developer # RUN apt-get update -RUN conda install python="3.7" +RUN lsb_release -a +# deactivate &**&)^&&*_)&ing conda +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +RUN echo $PATH +RUN rm -r /miniconda + +# install python 3.7 +RUN sudo apt-get update +RUN sudo apt-get install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev \ + libssl-dev libreadline-dev libffi-dev curl libbz2-dev libsqlite3-dev -y +RUN cd /opt \ + && curl -O https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz \ + && tar -xf Python-3.7.3.tar.xz \ + && cd Python-3.7.3 \ + && ./configure --enable-optimizations --with-ensurepip=install \ + --enable-loadable-sqlite-extensions\ + && make -j 8 \ + && make install + +RUN rm /opt/Python-3.7.3.tar.xz \ + && rm -r /opt/Python-3.7.3 + +RUN ln -s /usr/local/bin/python3.7 /usr/local/bin/python +RUN ln -s /usr/local/bin/pip3 /usr/local/bin/pip +RUN which python +RUN python --version + +# install arango for tests. Kind of pointless until the other deps are also installed ENV ARANGO_VER=3.5.1 ENV ARANGO_VER_PRE=35 @@ -32,9 +59,6 @@ WORKDIR /kb/module # really need a test build and a prod build. Not sure that's possible via sdk. RUN pipenv install --system --deploy --ignore-pipfile --dev -RUN which python -RUN python --version - RUN cd test \ && cp test.cfg.example test-sdk.cfg \ && sed -i "s#^test.temp.dir=.*#test.temp.dir=temp_test_dir#" test-sdk.cfg \ diff --git a/Pipfile b/Pipfile index 3f05f966..66a1b738 100644 --- a/Pipfile +++ b/Pipfile @@ -25,6 +25,8 @@ pint = "==0.10.1" python-ranges = "==0.1.3" confluent-kafka = "==1.3.0" pygtrie = "==2.3.2" +jinja2 = "==2.11.2" +uwsgi = "==2.0.18" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 8b8452c6..fb71047b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "936d8ff045ad3c00cdb26bfd23ad84d1cefd0ee8e830e103c3cda91a877def04" + "sha256": "5a4faaaa7c7b50b046f3d1596dc91fa2eb0b45e241f33b3c351f42407a6cea82" }, "pipfile-spec": 6, "requires": { @@ -106,6 +106,14 @@ "markers": "python_version < '3.8'", "version": "==1.6.0" }, + "jinja2": { + "hashes": [ + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + ], + "index": "pypi", + "version": "==2.11.2" + }, "jsonrpcbase": { "hashes": [ "sha256:7ea67fc1a7c87756e9a876e18a342e431e80d0ef3ba867dfd6f3fac5bf3fcc0d" @@ -128,6 +136,44 @@ "index": "pypi", "version": "==5.1.1" }, + "markupsafe": { + "hashes": [ + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", + "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", + "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", + "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", + "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", + "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", + "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", + "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "version": "==1.1.1" + }, "pint": { "hashes": [ "sha256:d5b5bcb570b2a8e0a598621fc41684497ff248f418bbfe00f69bd6e13caa14b8", @@ -217,6 +263,13 @@ ], "version": "==1.25.9" }, + "uwsgi": { + "hashes": [ + "sha256:4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583" + ], + "index": "pypi", + "version": "==2.0.18" + }, "zipp": { "hashes": [ "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b",