From 6137ccff41dc56761e10a108e0914345c687efac Mon Sep 17 00:00:00 2001 From: Alex Zurhake Date: Fri, 24 May 2019 15:24:20 +0200 Subject: [PATCH] temporary fix for Pipenv dependency issue Change-Id: If9e0cde1de05ac07f96ef66e86aea6fe3c91260a --- buildscripts/infrastructure/os-nodes/debian-8/Dockerfile | 9 +++++---- .../infrastructure/os-nodes/ubuntu-14.04/Dockerfile | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/buildscripts/infrastructure/os-nodes/debian-8/Dockerfile b/buildscripts/infrastructure/os-nodes/debian-8/Dockerfile index d1b0977386840..7f16e06d15399 100644 --- a/buildscripts/infrastructure/os-nodes/debian-8/Dockerfile +++ b/buildscripts/infrastructure/os-nodes/debian-8/Dockerfile @@ -21,13 +21,14 @@ RUN apt-get update \ libssl-dev \ make \ python-dev \ - python-dev \ - python3-pip \ + python-pip \ rrdtool \ strace \ vim \ - && pip3 install --upgrade setuptools \ - && pip3 install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ + && pip install --upgrade setuptools \ + && pip install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ + && pip uninstall pipenv \ + && pip install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs \ && apt-get install -y \ diff --git a/buildscripts/infrastructure/os-nodes/ubuntu-14.04/Dockerfile b/buildscripts/infrastructure/os-nodes/ubuntu-14.04/Dockerfile index e9bc3d1ef53c0..0876b7cc6ac25 100644 --- a/buildscripts/infrastructure/os-nodes/ubuntu-14.04/Dockerfile +++ b/buildscripts/infrastructure/os-nodes/ubuntu-14.04/Dockerfile @@ -22,13 +22,14 @@ RUN apt-get update \ make \ nullmailer \ python-dev \ - python-dev \ - python3-pip \ + python-pip \ rrdtool \ strace \ vim \ - && pip3 install --upgrade setuptools \ - && pip3 install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ + && pip install --upgrade setuptools \ + && pip install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ + && pip uninstall pipenv \ + && pip install git+https://github.com/svenpanne/pipenv.git@41f30d7ac848fdfe3eb548ddd19b731bfa8c331a \ && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs \ && apt-get install -y \