From 9cf29be0ee0b19c25471c19c224f9af150beaf1e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 6 Jan 2016 16:05:16 +0100 Subject: [PATCH] Add -f flag to cURL install instructions From the -f description: (HTTP) Fail silently (no output at all) on server errors. This is mostly done to better enable scripts etc to better deal with failed attempts. In normal cases when an HTTP server fails to deliver a document, it returns an HTML document stating so (which often also describes why and more). This flag will prevent curl from outputting that and return error 22. Signed-off-by: Sebastiaan van Stijn --- docs/examples/running_riak_service.Dockerfile | 2 +- docs/examples/running_riak_service.md | 2 +- docs/installation/centos.md | 2 +- docs/installation/fedora.md | 2 +- docs/installation/rhel.md | 2 +- hack/install.sh | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/examples/running_riak_service.Dockerfile b/docs/examples/running_riak_service.Dockerfile index 1051c1a42b..9b82cb023a 100644 --- a/docs/examples/running_riak_service.Dockerfile +++ b/docs/examples/running_riak_service.Dockerfile @@ -9,7 +9,7 @@ MAINTAINER Hector Castro hector@basho.com # Install Riak repository before we do apt-get update, so that update happens # in a single step RUN apt-get install -q -y curl && \ - curl -sSL https://packagecloud.io/install/repositories/basho/riak/script.deb | sudo bash + curl -fsSL https://packagecloud.io/install/repositories/basho/riak/script.deb | sudo bash # Install and setup project dependencies RUN apt-get update && \ diff --git a/docs/examples/running_riak_service.md b/docs/examples/running_riak_service.md index b42a1af9b1..8b18ac9342 100644 --- a/docs/examples/running_riak_service.md +++ b/docs/examples/running_riak_service.md @@ -37,7 +37,7 @@ script and we download the setup script and run it. # Install Riak repository before we do apt-get update, so that update happens # in a single step RUN apt-get install -q -y curl && \ - curl -sSL https://packagecloud.io/install/repositories/basho/riak/script.deb | sudo bash + curl -fsSL https://packagecloud.io/install/repositories/basho/riak/script.deb | sudo bash Then we install and setup a few dependencies: diff --git a/docs/installation/centos.md b/docs/installation/centos.md index bca7778585..e447e21452 100644 --- a/docs/installation/centos.md +++ b/docs/installation/centos.md @@ -109,7 +109,7 @@ package manager. 3. Run the Docker installation script. - $ curl -sSL https://get.docker.com/ | sh + $ curl -fsSL https://get.docker.com/ | sh This script adds the `docker.repo` repository and installs Docker. diff --git a/docs/installation/fedora.md b/docs/installation/fedora.md index 13c5fc3bd6..3e9dd5ddfa 100644 --- a/docs/installation/fedora.md +++ b/docs/installation/fedora.md @@ -104,7 +104,7 @@ There are two ways to install Docker Engine. You can install with the `dnf` pac 3. Run the Docker installation script. - $ curl -sSL https://get.docker.com/ | sh + $ curl -fsSL https://get.docker.com/ | sh This script adds the `docker.repo` repository and installs Docker. diff --git a/docs/installation/rhel.md b/docs/installation/rhel.md index 96d2e2d9cf..6c20f273b3 100644 --- a/docs/installation/rhel.md +++ b/docs/installation/rhel.md @@ -104,7 +104,7 @@ You use the same installation procedure for all versions of CentOS. 3. Run the Docker installation script. - $ curl -sSL https://get.docker.com/ | sh + $ curl -fsSL https://get.docker.com/ | sh 4. Start the Docker daemon. diff --git a/hack/install.sh b/hack/install.sh index 53876d8a04..eae3b13ad0 100755 --- a/hack/install.sh +++ b/hack/install.sh @@ -7,12 +7,12 @@ set -e # 'wget -qO- https://get.docker.com/ | sh' # # For test builds (ie. release candidates): -# 'curl -sSL https://test.docker.com/ | sh' +# 'curl -fsSL https://test.docker.com/ | sh' # or: # 'wget -qO- https://test.docker.com/ | sh' # # For experimental builds: -# 'curl -sSL https://experimental.docker.com/ | sh' +# 'curl -fsSL https://experimental.docker.com/ | sh' # or: # 'wget -qO- https://experimental.docker.com/ | sh' #