Merge pull request #4377 from stephendonner/bug-1444272

Bug 1444272 - Pin pipenv, and remove --deploy
mozilla-services · Mar 10, 2018 · 064adbe · 064adbe
2 parents 80507d8 + 799ae8c
commit 064adbe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/e2e-tests/.gitignore b/e2e-tests/.gitignore
@@ -1,3 +1,4 @@
 .cache
 *.pyc
+Pipfile.lock
 results/
diff --git a/e2e-tests/Dockerfile b/e2e-tests/Dockerfile
@@ -10,8 +10,11 @@ RUN apt-get update \
   && apt-get install -y bzip2 curl firefox python2.7 \
   && rm -rf /var/lib/apt/lists/*
 
-RUN curl -fsSL https://bootstrap.pypa.io/get-pip.py | python2.7 \
-  && pip install pipenv
+WORKDIR /src
+COPY pipenv.txt /src
+
+RUN curl -fsSL https://bootstrap.pypa.io/get-pip.py | python2.7
+RUN pip install -r pipenv.txt
 
 ENV FIREFOX_VERSION=58.0.1
 
@@ -34,7 +37,7 @@ RUN curl -fsSLo /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/r
 
 WORKDIR /src
 COPY requirements/requirements.txt /src
-RUN pipenv install --system -r requirements.txt --skip-lock --deploy
+RUN pipenv install --system -r requirements.txt --skip-lock
 
 COPY . /src
 CMD pytest --driver Firefox
diff --git a/e2e-tests/pipenv.txt b/e2e-tests/pipenv.txt
@@ -0,0 +1 @@
+pipenv==10.1.2