Merge 0600ccb into a53b35b

ledatelescope · Feb 5, 2021 · 5be30bc · 5be30bc
2 parents a53b35b + 0600ccb
commit 5be30bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Dockerfile.cpu b/Dockerfile.cpu
@@ -8,15 +8,13 @@ ENV TERM xterm
 
 # Get dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
+        python-pip \
         pylint \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Update ctypesgen
-RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
 RUN pip --no-cache-dir install \
         git+https://github.com/olsonse/ctypesgen.git@9bd2d249aa4011c6383a10890ec6f203d7b7990f
 

diff --git a/Dockerfile.gpu b/Dockerfile.gpu
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         software-properties-common \
         python \
         python-dev \
+        python-pip \
         pylint \
         doxygen \
         exuberant-ctags \
@@ -22,9 +23,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
 RUN pip --no-cache-dir install \
         setuptools \
         numpy \

diff --git a/Dockerfile_prereq.gpu b/Dockerfile_prereq.gpu
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         software-properties-common \
         python \
         python-dev \
+        python-pip \
         doxygen \
         exuberant-ctags \
         nano \
@@ -21,9 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
 RUN pip --no-cache-dir install \
         setuptools \
         numpy \