Skip to content

Commit 750546c

Browse files
tianontianon
committed
Merge pull request #73 from infosiftr/curl-f
Add "-f" to all "curl" invocations
2 parents 00c226b + 033320b commit 750546c

File tree

15 files changed

+39
-39
lines changed

15 files changed

+39
-39
lines changed

‎2.7/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎2.7/slim/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN set -x \
3737
' \
3838
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
3939
&& mkdir -p /usr/src/python \
40-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
40+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
4242
&& gpg --verify python.tar.xz.asc \
4343
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4444
&& rm python.tar.xz* \
@@ -47,7 +47,7 @@ RUN set -x \
4747
&& make -j$(nproc) \
4848
&& make install \
4949
&& ldconfig \
50-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
50+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
5151
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
5252
&& find /usr/local \
5353
\( -type d -a -name test -o -name tests \) \

‎2.7/wheezy/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎3.2/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎3.2/slim/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN set -x \
3737
' \
3838
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
3939
&& mkdir -p /usr/src/python \
40-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
40+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
4242
&& gpg --verify python.tar.xz.asc \
4343
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4444
&& rm python.tar.xz* \
@@ -47,7 +47,7 @@ RUN set -x \
4747
&& make -j$(nproc) \
4848
&& make install \
4949
&& ldconfig \
50-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
50+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
5151
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
5252
&& find /usr/local \
5353
\( -type d -a -name test -o -name tests \) \

‎3.2/wheezy/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎3.3/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎3.3/slim/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN set -x \
3737
' \
3838
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
3939
&& mkdir -p /usr/src/python \
40-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
40+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
4242
&& gpg --verify python.tar.xz.asc \
4343
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4444
&& rm python.tar.xz* \
@@ -47,7 +47,7 @@ RUN set -x \
4747
&& make -j$(nproc) \
4848
&& make install \
4949
&& ldconfig \
50-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
50+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
5151
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
5252
&& find /usr/local \
5353
\( -type d -a -name test -o -name tests \) \

‎3.3/wheezy/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \
@@ -27,7 +27,7 @@ RUN set -x \
2727
&& make -j$(nproc) \
2828
&& make install \
2929
&& ldconfig \
30-
&& curl -SL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
30+
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
3131
&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
3232
&& find /usr/local \
3333
\( -type d -a -name test -o -name tests \) \

‎3.4/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \

‎3.4/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN set -x \
3737
' \
3838
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
3939
&& mkdir -p /usr/src/python \
40-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
40+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
4242
&& gpg --verify python.tar.xz.asc \
4343
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4444
&& rm python.tar.xz* \

‎3.4/wheezy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \

‎3.5/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV PYTHON_PIP_VERSION 7.1.2
1717

1818
RUN set -x \
1919
&& mkdir -p /usr/src/python \
20-
&& curl -SL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21-
&& curl -SL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
20+
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
21+
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
2222
&& gpg --verify python.tar.xz.asc \
2323
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2424
&& rm python.tar.xz* \

‎3.5/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN set -x \
3737
' \
3838
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
3939
&& mkdir -p /usr/src/python \
40-
&& curl -SL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41-
&& curl -SL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
40+
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
41+
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
4242
&& gpg --verify python.tar.xz.asc \
4343
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4444
&& rm python.tar.xz* \

‎update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ if [ ${#versions[@]} -eq 0 ]; then
99
fi
1010
versions=( "${versions[@]%/}" )
1111

12-
pipVersion="$(curl -sSL 'https://pypi.python.org/pypi/pip/json' | awk -F '"' '$2 == "version" { print $4 }')"
12+
pipVersion="$(curl -fsSL 'https://pypi.python.org/pypi/pip/json' | awk -F '"' '$2 == "version" { print $4 }')"
1313

1414
for version in "${versions[@]}"; do
1515
# <span class="release-number"><a href="/downloads/release/python-278/">Python 2.7.8</a></span>
1616
# <span class="release-number"><a href="/downloads/release/python-341/">Python 3.4.1</a></span>
17-
fullVersion="$(curl -sSL 'https://www.python.org/downloads/' | awk -F 'Python |</a>' '/<span class="release-number"><a[^>]+>Python '"$version"'./ { print $2 }' | grep -v 'rc' | sort -V | tail -1)"
17+
fullVersion="$(curl -fsSL 'https://www.python.org/downloads/' | awk -F 'Python |</a>' '/<span class="release-number"><a[^>]+>Python '"$version"'./ { print $2 }' | grep -v 'rc' | sort -V | tail -1)"
1818
# TODO figure out a better want to handle RCs than just filtering them out wholesale
1919
if [ -z "$fullVersion" ]; then
2020
echo >&2 "warning: cannot find $version"

0 commit comments

Comments
 (0)