From 43600d66369b22610f1f6210800b4bd0215c720c Mon Sep 17 00:00:00 2001 From: Chuck Cox Date: Mon, 27 Jan 2020 17:03:43 -0600 Subject: [PATCH] fix: correct pipenv process --- Dockerfile | 2 +- Dockerfile-tools | 2 +- Pipfile | 3 --- Pipfile.lock | 25 ++++++++++++++----------- README.md | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17f45fa..766ab5d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN yum install python3-pip wget RUN pip install --upgrade pip \ && pip install --upgrade pipenv\ - && pipenv install --system --deploy --ignore-pipfile + && pipenv install --system --deploy USER 1001 diff --git a/Dockerfile-tools b/Dockerfile-tools index 3f1c68a..7369c89 100755 --- a/Dockerfile-tools +++ b/Dockerfile-tools @@ -13,7 +13,7 @@ RUN yum -y install --disableplugin=subscription-manager python3-pip wget \ && yum --disableplugin=subscription-manager clean all RUN pip3 install pipenv -RUN pipenv install --system --deploy --ignore-pipfile +RUN pipenv install # Update python command to point to python3 install RUN alternatives --set python /usr/bin/python3 diff --git a/Pipfile b/Pipfile index 6ad6a79..2f1f687 100644 --- a/Pipfile +++ b/Pipfile @@ -11,6 +11,3 @@ ibmcloudenv = "*" livereload = "*" Flask = ">=1.0.0" prometheus_client = "*" - -[requires] -python_version = ">=3" diff --git a/Pipfile.lock b/Pipfile.lock index 702ef99..75e6f8b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,12 +1,10 @@ { "_meta": { "hash": { - "sha256": "c049ba114bc84932cbe4759fd692ac78c6a60b44b5c83f559d75bba9864bae29" + "sha256": "86e20a1085de8d59cdc649fe33ab6e84f949e28fa78a5a20bbc5412f224e3fba" }, "pipfile-spec": 6, - "requires": { - "python_version": ">=3" - }, + "requires": {}, "sources": [ { "name": "pypi", @@ -63,10 +61,10 @@ }, "jinja2": { "hashes": [ - "sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f", - "sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de" + "sha256:6e7a3c2934694d59ad334c93dd1b6c96699cf24c53fdb8ec848ac6b23e685734", + "sha256:d6609ae5ec3d56212ca7d802eda654eaf2310000816ce815361041465b108be4" ], - "version": "==2.10.3" + "version": "==2.11.0" }, "jsonpath-rw": { "hashes": [ @@ -88,13 +86,16 @@ "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", @@ -111,7 +112,9 @@ "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], "version": "==1.1.1" }, @@ -150,10 +153,10 @@ }, "werkzeug": { "hashes": [ - "sha256:7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7", - "sha256:e5f4a1f98b52b18a93da705a7458e55afb26f32bff83ff5d19189f92462d65c4" + "sha256:1e0dedc2acb1f46827daa2e399c1485c8fa17c0d8e70b6b875b4e7f54bf408d2", + "sha256:b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04" ], - "version": "==0.16.0" + "version": "==0.16.1" } }, "develop": {} diff --git a/README.md b/README.md index 2bc57a0..a3fd4db 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,10 @@ To get started building this application locally, you can either run the applica * Install [Python](https://www.python.org/downloads/) -Running Flask applications has been simplified with a `manage.py` file to avoid dealing with configuring environment variables to run your app. From your project root, you can download the project dependencies with: +Running Flask applications has been simplified with a `manage.py` file to avoid dealing with configuring environment variables to run your app. From your project root, you can download the project dependencies with (NOTE: If you don't have pipenv installed, execute: `pip install pipenv`): ```bash -pipenv install --system --deploy --ignore-pipfile +pipenv install ``` To run your application locally: