mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/ - https://botbot.me/freenode/docker-dev/msg/17315994/ Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
parent
e2c575c5a6
commit
9f61e233c6
10 changed files with 17 additions and 14 deletions
|
@ -175,7 +175,7 @@ One way to automate this, is customise your get ``commit.template`` by adding
|
|||
a ``prepare-commit-msg`` hook to your docker checkout:
|
||||
|
||||
```
|
||||
curl -o .git/hooks/prepare-commit-msg https://raw.githubusercontent.com/dotcloud/docker/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
|
||||
curl -sSL -o .git/hooks/prepare-commit-msg https://raw.githubusercontent.com/dotcloud/docker/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
|
||||
```
|
||||
|
||||
* Note: the above script expects to find your GitHub user name in ``git config --get github.user``
|
||||
|
|
|
@ -60,7 +60,7 @@ RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper
|
|||
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
||||
|
||||
# Install Go
|
||||
RUN curl -s https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
|
||||
RUN curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
|
||||
ENV PATH /usr/local/go/bin:$PATH
|
||||
ENV GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
|
||||
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
|
||||
|
|
|
@ -133,7 +133,7 @@ Here's a typical Docker build process:
|
|||
FROM ubuntu:12.04
|
||||
RUN apt-get update
|
||||
RUN apt-get install -q -y python python-pip curl
|
||||
RUN curl -L https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv
|
||||
RUN curl -sSL https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv
|
||||
RUN cd helloflask-master && pip install -r requirements.txt
|
||||
```
|
||||
|
||||
|
|
|
@ -19,12 +19,12 @@ tmp() {
|
|||
}
|
||||
|
||||
apkv() {
|
||||
curl -s $REPO/$ARCH/APKINDEX.tar.gz | tar -Oxz |
|
||||
curl -sSL $REPO/$ARCH/APKINDEX.tar.gz | tar -Oxz |
|
||||
grep '^P:apk-tools-static$' -A1 | tail -n1 | cut -d: -f2
|
||||
}
|
||||
|
||||
getapk() {
|
||||
curl -s $REPO/$ARCH/apk-tools-static-$(apkv).apk |
|
||||
curl -sSL $REPO/$ARCH/apk-tools-static-$(apkv).apk |
|
||||
tar -xz -C $TMP sbin/apk.static
|
||||
}
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ After that, we install and setup a few dependencies:
|
|||
|
||||
Next, we add Basho's APT repository:
|
||||
|
||||
RUN curl -s http://apt.basho.com/gpg/basho.apt.key | apt-key add --
|
||||
RUN curl -sSL http://apt.basho.com/gpg/basho.apt.key | apt-key add --
|
||||
RUN echo "deb http://apt.basho.com $(lsb_release -cs) main" > /etc/apt/sources.list.d/basho.list
|
||||
RUN apt-get update
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ page_keywords: Docker, Docker documentation, installation, google, Google Comput
|
|||
2. Download and configure the [Google Cloud SDK][3] to use your
|
||||
project with the following commands:
|
||||
|
||||
$ curl https://sdk.cloud.google.com | bash
|
||||
$ curl -sSL https://sdk.cloud.google.com | bash
|
||||
$ gcloud auth login
|
||||
$ gcloud config set project <google-cloud-project-id>
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ continue installation.*
|
|||
>
|
||||
> There is also a simple `curl` script available to help with this process.
|
||||
>
|
||||
> $ curl -s https://get.docker.io/ubuntu/ | sudo sh
|
||||
> $ curl -sSL https://get.docker.io/ubuntu/ | sudo sh
|
||||
|
||||
To verify that everything has worked as expected:
|
||||
|
||||
|
@ -134,7 +134,7 @@ continue installation.*
|
|||
>
|
||||
> There is also a simple `curl` script available to help with this process.
|
||||
>
|
||||
> $ curl -s https://get.docker.io/ubuntu/ | sudo sh
|
||||
> $ curl -sSL https://get.docker.io/ubuntu/ | sudo sh
|
||||
|
||||
Now verify that the installation has worked by downloading the
|
||||
`ubuntu` image and launching a container.
|
||||
|
|
|
@ -181,7 +181,7 @@ Announcing on IRC in both `#docker` and `#docker-dev` is a great way to get
|
|||
help testing! An easy way to get some useful links for sharing:
|
||||
|
||||
```bash
|
||||
echo "Ubuntu/Debian install script: curl -sLS https://test.docker.io/ | sh"
|
||||
echo "Ubuntu/Debian: https://test.docker.io/ubuntu or curl -sSL https://test.docker.io/ | sh"
|
||||
echo "Linux 64bit binary: https://test.docker.io/builds/Linux/x86_64/docker-${VERSION#v}"
|
||||
echo "Darwin/OSX 64bit client binary: https://test.docker.io/builds/Darwin/x86_64/docker-${VERSION#v}"
|
||||
echo "Darwin/OSX 32bit client binary: https://test.docker.io/builds/Darwin/i386/docker-${VERSION#v}"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
set -e
|
||||
#
|
||||
# This script is meant for quick & easy install via:
|
||||
# 'curl -sL https://get.docker.io/ | sh'
|
||||
# 'curl -sSL https://get.docker.io/ | sh'
|
||||
# or:
|
||||
# 'wget -qO- https://get.docker.io/ | sh'
|
||||
#
|
||||
|
@ -54,7 +54,7 @@ fi
|
|||
|
||||
curl=''
|
||||
if command_exists curl; then
|
||||
curl='curl -sL'
|
||||
curl='curl -sSL'
|
||||
elif command_exists wget; then
|
||||
curl='wget -qO-'
|
||||
elif command_exists busybox && busybox --list-modules | grep -q wget; then
|
||||
|
@ -133,7 +133,7 @@ case "$lsb_dist" in
|
|||
if [ -z "$curl" ]; then
|
||||
apt_get_update
|
||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q curl' )
|
||||
curl='curl -sL'
|
||||
curl='curl -sSL'
|
||||
fi
|
||||
(
|
||||
set -x
|
||||
|
|
|
@ -282,10 +282,13 @@ if [ ! -e /usr/lib/apt/methods/https ]; then
|
|||
apt-get update
|
||||
apt-get install -y apt-transport-https
|
||||
fi
|
||||
|
||||
# Add the repository to your APT sources
|
||||
echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
|
||||
|
||||
# Then import the repository key
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
|
||||
|
||||
# Install docker
|
||||
apt-get update ; apt-get install -y lxc-docker
|
||||
|
||||
|
@ -318,7 +321,7 @@ release_binaries() {
|
|||
|
||||
cat <<EOF | write_to_s3 s3://$BUCKET/builds/index
|
||||
# To install, run the following command as root:
|
||||
curl -O $(s3_url)/builds/Linux/x86_64/docker-$VERSION && chmod +x docker-$VERSION && sudo mv docker-$VERSION /usr/local/bin/docker
|
||||
curl -sSL -O $(s3_url)/builds/Linux/x86_64/docker-$VERSION && chmod +x docker-$VERSION && sudo mv docker-$VERSION /usr/local/bin/docker
|
||||
# Then start docker in daemon mode:
|
||||
sudo /usr/local/bin/docker -d
|
||||
EOF
|
||||
|
|
Loading…
Reference in a new issue