From 87732f2d6b562b6c50ec4620ec97d63f83857d0a Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 2 Sep 2023 02:03:01 +0200 Subject: [PATCH 1/3] install pip with | --- cpu/Dockerfile | 7 +++---- gpu/Dockerfile | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cpu/Dockerfile b/cpu/Dockerfile index a2fb33e..537bef9 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -35,13 +35,12 @@ RUN \ # install python dependencies # sysctl -w net.ipv4.ip_forward=1 ; \ if [[ "$PYTHON_VERSION" == "2.7" || "$PYTHON_VERSION" == "3.6" ]]; then \ - wget https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py --progress=bar:force:noscroll --no-check-certificate ; \ + PIP_URL="https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py" ; \ else \ apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \ - wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate ; \ + PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \ fi && \ - python${PYTHON_VERSION} get-pip.py && \ - rm get-pip.py && \ + curl $PIP_URL --progress=bar:force:noscroll --no-check-certificate | python && \ rm -rf /var/lib/apt/lists/* ENV PYTHONPATH="/usr/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python${PYTHON_VERSION}/site-packages" diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 059674d..01d3629 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -43,13 +43,12 @@ RUN \ # install python dependencies # sysctl -w net.ipv4.ip_forward=1 ; \ if [[ "$PYTHON_VERSION" == "2.7" || "$PYTHON_VERSION" == "3.6" ]]; then \ - wget https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py --progress=bar:force:noscroll --no-check-certificate ; \ + PIP_URL="https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py" ; \ else \ apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \ - wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate ; \ + PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \ fi && \ - python${PYTHON_VERSION} get-pip.py && \ - rm get-pip.py && \ + curl $PIP_URL --progress=bar:force:noscroll --no-check-certificate | python && \ rm -rf /var/lib/apt/lists/* ENV PYTHONPATH="/usr/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python${PYTHON_VERSION}/site-packages" From 4df00043ef2c0df0ce2b456485ba75211e8f5315 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 2 Sep 2023 02:04:20 +0200 Subject: [PATCH 2/3] curl --- cpu/Dockerfile | 2 +- gpu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/Dockerfile b/cpu/Dockerfile index 537bef9..84cc7ba 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -40,7 +40,7 @@ RUN \ apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \ PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \ fi && \ - curl $PIP_URL --progress=bar:force:noscroll --no-check-certificate | python && \ + curl $PIP_URL | python && \ rm -rf /var/lib/apt/lists/* ENV PYTHONPATH="/usr/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python${PYTHON_VERSION}/site-packages" diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 01d3629..472802d 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -48,7 +48,7 @@ RUN \ apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \ PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \ fi && \ - curl $PIP_URL --progress=bar:force:noscroll --no-check-certificate | python && \ + curl $PIP_URL | python && \ rm -rf /var/lib/apt/lists/* ENV PYTHONPATH="/usr/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python${PYTHON_VERSION}/site-packages" From b1fe49d19ed8b162392813e6b14b62a5b7650f32 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 2 Sep 2023 02:11:13 +0200 Subject: [PATCH 3/3] curl --- cpu/Dockerfile | 1 + gpu/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/cpu/Dockerfile b/cpu/Dockerfile index 84cc7ba..ea501b0 100644 --- a/cpu/Dockerfile +++ b/cpu/Dockerfile @@ -25,6 +25,7 @@ RUN \ python${PYTHON_VERSION} \ python${PYTHON_VERSION}-dev \ $( [ ${PYTHON_VERSION%%.*} -ge 3 ] && echo "python${PYTHON_VERSION}-distutils" ) \ + curl \ wget \ && \ diff --git a/gpu/Dockerfile b/gpu/Dockerfile index 472802d..1c929f8 100644 --- a/gpu/Dockerfile +++ b/gpu/Dockerfile @@ -33,6 +33,7 @@ RUN \ python${PYTHON_VERSION} \ python${PYTHON_VERSION}-dev \ $( [ ${PYTHON_VERSION%%.*} -ge 3 ] && echo "python${PYTHON_VERSION}-distutils" ) \ + curl \ wget \ && \