Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-02-02 07:46:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix download of files using up-to-date "curl" instead of "wget"

Browse Source 
In few images, curl is only tool that able to download from https
source requiring TLS 1.2
This commit is contained in:
Jean-Christophe Fillion-Robin 2018-03-29 15:07:54 -04:00 committed by Francois Budin
parent 53990df0b8
commit 53d98cf4ff
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.debian
View File

@ -36,10 +36,10 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
ENV GOSU_VERSION 1.10 ENV GOSU_VERSION 1.10
RUN set -x \ RUN set -x \
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ && apt-get update && rm -rf /var/lib/apt/lists/* \
&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && curl -# -o /usr/local/bin/gosu -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ && curl -# -o /usr/local/bin/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \

2
common.docker
View File

@ -31,7 +31,7 @@ RUN \
RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \ RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \
: nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \ : nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \
else \ else \
wget https://bootstrap.pypa.io/get-pip.py && \ curl -# -LO https://bootstrap.pypa.io/get-pip.py && \
python get-pip.py --ignore-installed && \ python get-pip.py --ignore-installed && \
rm get-pip.py || exit 1; \ rm get-pip.py || exit 1; \
fi fi

6
common.manylinux
View File

@ -1,10 +1,10 @@
ENV GOSU_VERSION 1.10 ENV GOSU_VERSION 1.10
RUN set -x \ RUN set -x \
&& yum -y install epel-release \ && yum -y install epel-release \
&& yum -y install wget gpg \ && yum -y install gpg \
&& dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \ && dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \
&& wget -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && curl -o /usr/bin/gosu -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
&& wget -O /tmp/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ && curl -o /tmp/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \

2
imagefiles/install-cmake.sh
View File

@ -46,7 +46,7 @@ cd /usr/src
# Download # Download
CMAKE_REV=v3.10.1 CMAKE_REV=v3.10.1
wget --progress=bar:force https://github.com/kitware/cmake/archive/$CMAKE_REV.tar.gz -O CMake.tar.gz curl -# -o CMake.tar.gz -LO https://github.com/kitware/cmake/archive/$CMAKE_REV.tar.gz
mkdir CMake mkdir CMake
tar -xzvf ./CMake.tar.gz --strip-components=1 -C ./CMake tar -xzvf ./CMake.tar.gz --strip-components=1 -C ./CMake

2
imagefiles/install-crosstool-ng-toolchain.sh
View File

@ -58,7 +58,7 @@ cd "${CTNG}"
# Download and install the "crosstool-ng" source. # Download and install the "crosstool-ng" source.
REV=1.23.0 REV=1.23.0
wget --progress=bar:force \ curl -# -LO \
"https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-${REV}.tar.gz" "https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-${REV}.tar.gz"
tar -xf "crosstool-ng-${REV}.tar.gz" tar -xf "crosstool-ng-${REV}.tar.gz"
cd "crosstool-ng-crosstool-ng-${REV}" cd "crosstool-ng-crosstool-ng-${REV}"

2
imagefiles/install-ninja.sh
View File

@ -27,7 +27,7 @@ done
# Download # Download
REV=v1.7.2 REV=v1.7.2
wget --progress=bar:force https://github.com/ninja-build/ninja/archive/$REV.tar.gz -O ninja.tar.gz curl -# -o ninja.tar.gz -LO https://github.com/ninja-build/ninja/archive/$REV.tar.gz
mkdir ninja mkdir ninja
tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja

2
imagefiles/install-openssl.sh
View File

@ -49,7 +49,7 @@ cd /usr/src
# Download # Download
if [ ! -f ./openssl-$OPENSSL_VERSION.tar.gz ]; then if [ ! -f ./openssl-$OPENSSL_VERSION.tar.gz ]; then
wget --progress=bar:force https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz curl -# -LO https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
else else
rm -rf ./openssl-$OPENSSL_VERSION rm -rf ./openssl-$OPENSSL_VERSION
fi fi