From 963a05ff61c34c1290575fd9f5c231858bff524f Mon Sep 17 00:00:00 2001 From: David Mailhot Date: Tue, 13 Oct 2020 14:07:19 -0700 Subject: [PATCH 1/3] Update loadgenerator Dockerfile to fix Pip incompatibility --- src/loadgenerator/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/loadgenerator/Dockerfile b/src/loadgenerator/Dockerfile index b894dc5..453b846 100644 --- a/src/loadgenerator/Dockerfile +++ b/src/loadgenerator/Dockerfile @@ -12,16 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM python:3-slim as base +FROM python:3.7.2-slim as base FROM base as builder RUN apt-get -qq update \ && apt-get install -y --no-install-recommends \ - g++ + g++ libzmq3-dev COPY requirements.txt . +RUN pip install --upgrade pip RUN pip install --prefix="/install" -r requirements.txt FROM base From 338ffe0dc199d13ae8e7545748ba805e6bcba45b Mon Sep 17 00:00:00 2001 From: David Mailhot Date: Wed, 14 Oct 2020 13:50:26 -0700 Subject: [PATCH 2/3] Remove conditions to loadgenerator Dockerfile that are not reproducable --- src/loadgenerator/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/loadgenerator/Dockerfile b/src/loadgenerator/Dockerfile index 453b846..4f298f9 100644 --- a/src/loadgenerator/Dockerfile +++ b/src/loadgenerator/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM python:3.7.2-slim as base +FROM python:3-slim as base FROM base as builder @@ -22,7 +22,6 @@ RUN apt-get -qq update \ COPY requirements.txt . -RUN pip install --upgrade pip RUN pip install --prefix="/install" -r requirements.txt FROM base From ebedfdfbf01bc232a5e5f186326ecf8c9fc9620e Mon Sep 17 00:00:00 2001 From: David Mailhot Date: Wed, 14 Oct 2020 14:10:05 -0700 Subject: [PATCH 3/3] Pin pip version to avoid PEP 517 --- src/loadgenerator/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/loadgenerator/Dockerfile b/src/loadgenerator/Dockerfile index 4f298f9..8ce858b 100644 --- a/src/loadgenerator/Dockerfile +++ b/src/loadgenerator/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get -qq update \ COPY requirements.txt . +# Pin Pip version: unable to build wheel for gevent with PEP 517 +RUN python -m pip install --force-reinstall pip==20.1.1 + RUN pip install --prefix="/install" -r requirements.txt FROM base