From e177710b684d7841ad9e53c910487c5acf069e3e Mon Sep 17 00:00:00 2001 From: Ryan Luckie Date: Fri, 3 May 2019 16:59:38 -0500 Subject: [PATCH] Curl should not fail silently --- files/Dockerfile | 82 ++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/files/Dockerfile b/files/Dockerfile index 6bac8dd..f93be01 100644 --- a/files/Dockerfile +++ b/files/Dockerfile @@ -66,19 +66,19 @@ RUN echo "Install OS packages" && \ wget \ whois \ xauth && \ - curl -sSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ + curl -sSfL https://download.docker.com/linux/debian/gpg | apt-key add - && \ add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/debian \ $(lsb_release -cs) \ stable" && \ export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ - curl -sSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ + curl -sSfL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ export POSTGRESQL_REPO="$(lsb_release -c -s)-pgdg" && \ echo "deb https://apt.postgresql.org/pub/repos/apt $POSTGRESQL_REPO main" | tee -a /etc/apt/sources.list.d/pgdg.list && \ - curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - curl -sL https://deb.nodesource.com/setup_11.x | bash - && \ - curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + curl -sSfL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ + curl -sSfL https://deb.nodesource.com/setup_11.x | bash - && \ + curl -sSfL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee -a /etc/apt/sources.list.d/yarn.list && \ apt-get update -y && apt-get --no-install-recommends -y install \ docker-ce \ @@ -150,7 +150,7 @@ RUN echo "Configuring systemd" && \ # Install python-based utils and libs RUN echo "Install python-based utils and libs" && \ - curl -sSL https://bootstrap.pypa.io/get-pip.py | python2 && \ + curl -sSfL https://bootstrap.pypa.io/get-pip.py | python2 && \ pip2.7 install --no-cache-dir -U setuptools && \ pip2.7 install \ --no-cache-dir \ @@ -172,7 +172,7 @@ RUN echo "Install python-based utils and libs" && \ 'urllib3==1.22' \ 'virtualenv==16.0.0' \ 'yq==2.7.0' && \ - curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 && \ + curl -sSfL https://bootstrap.pypa.io/get-pip.py | python3 && \ pip3.5 install --no-cache-dir -U setuptools && \ pip3.5 install \ --no-cache-dir \ @@ -203,76 +203,76 @@ RUN echo "Install python-based utils and libs" && \ RUN echo "Install apps (with pinned version) that are not provided by the OS packages." && \ echo "Install dep." && \ - curl -sSLo dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64 && \ + curl -sSfLo dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64 && \ chmod a+x dep && mv dep /usr/local/bin && \ echo "Install direnv." && \ - curl -sSLo direnv https://github.com/direnv/direnv/releases/download/v2.20.0/direnv.linux-amd64 && \ + curl -sSfLo direnv https://github.com/direnv/direnv/releases/download/v2.20.0/direnv.linux-amd64 && \ chmod a+x direnv && mv direnv /usr/local/bin && \ echo "Install drone-cli." && \ - curl -sSL https://github.com/drone/drone-cli/releases/download/v1.1.0/drone_linux_amd64.tar.gz | tar xz && \ + curl -sSfL https://github.com/drone/drone-cli/releases/download/v1.1.0/drone_linux_amd64.tar.gz | tar xz && \ chmod a+x drone && mv drone /usr/local/bin/drone-1.1.0 && \ ln -s /usr/local/bin/drone-1.1.0 /usr/local/bin/drone && \ echo "Install easy-rsa." && \ - curl -sSL https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.6/EasyRSA-unix-v3.0.6.tgz | tar xz && \ + curl -sSfL https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.6/EasyRSA-unix-v3.0.6.tgz | tar xz && \ chmod a+x EasyRSA-* && mv EasyRSA-* /usr/local/bin/easyrsa && \ echo "Install go-task." && \ - curl -sSL https://github.com/go-task/task/releases/download/v2.5.1/task_linux_amd64.tar.gz | tar -C /usr/local/bin -xz task && chmod a+x /usr/local/bin/task && \ + curl -sSfL https://github.com/go-task/task/releases/download/v2.5.1/task_linux_amd64.tar.gz | tar -C /usr/local/bin -xz task && chmod a+x /usr/local/bin/task && \ echo "Install gomplate." && \ - curl -sSLo gomplate https://github.com/hairyhenderson/gomplate/releases/download/v3.4.0/gomplate_linux-amd64 && \ + curl -sSfLo gomplate https://github.com/hairyhenderson/gomplate/releases/download/v3.4.0/gomplate_linux-amd64 && \ chmod a+x gomplate && mv gomplate /usr/local/bin && \ echo "Install golang." && \ - curl -sSL https://dl.google.com/go/go1.12.4.linux-amd64.tar.gz | tar -C /usr/local -xz && \ + curl -sSfL https://dl.google.com/go/go1.12.4.linux-amd64.tar.gz | tar -C /usr/local -xz && \ mkdir -p /go && chmod a+rw /go && \ echo "Install goreleaser." && \ - curl -sSLO https://github.com/goreleaser/goreleaser/releases/download/v0.106.0/goreleaser_Linux_x86_64.tar.gz && \ + curl -sSfLO https://github.com/goreleaser/goreleaser/releases/download/v0.106.0/goreleaser_Linux_x86_64.tar.gz && \ tar -C /usr/local/bin -xzf goreleaser*.tar.gz goreleaser && rm goreleaser*.tar.gz && \ echo "Install grpcurl." && \ - curl -sSL https://github.com/fullstorydev/grpcurl/releases/download/v1.2.1/grpcurl_1.2.1_linux_x86_64.tar.gz | tar -C /usr/local/bin -xz grpcurl && chmod a+x /usr/local/bin/grpcurl && \ + curl -sSfL https://github.com/fullstorydev/grpcurl/releases/download/v1.2.1/grpcurl_1.2.1_linux_x86_64.tar.gz | tar -C /usr/local/bin -xz grpcurl && chmod a+x /usr/local/bin/grpcurl && \ echo "Install helm." && \ - curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-v2.11.0-linux-amd64.tar.gz | tar xz && \ + curl -sSfL https://storage.googleapis.com/kubernetes-helm/helm-v2.11.0-linux-amd64.tar.gz | tar xz && \ chmod a+x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helm-2.11.0 && rm -fr linux-amd64 && \ - curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz | tar xz && \ + curl -sSfL https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz | tar xz && \ chmod a+x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helm-2.12.3 && rm -fr linux-amd64 && \ - curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz | tar xz && \ + curl -sSfL https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz | tar xz && \ chmod a+x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helm-2.13.1 && rm -fr linux-amd64 && \ ln -s /usr/local/bin/helm-2.13.1 /usr/local/bin/helm && \ echo "Install helmfile" && \ - curl -sSLo helmfile https://github.com/roboll/helmfile/releases/download/v0.54.2/helmfile_linux_amd64 && \ + curl -sSfLo helmfile https://github.com/roboll/helmfile/releases/download/v0.54.2/helmfile_linux_amd64 && \ chmod a+x helmfile && mv helmfile /usr/local/bin && \ echo "Install hugo." && \ - curl -sSL https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_0.55.4_Linux-64bit.tar.gz | tar xz && \ + curl -sSfL https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_0.55.4_Linux-64bit.tar.gz | tar xz && \ chmod a+x hugo && mv hugo /usr/local/bin/hugo && \ echo "Install jq." && \ - curl -sSLo jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \ + curl -sSfLo jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \ chmod a+x jq && mv jq /usr/local/bin/ && \ echo "Install kops." && \ - curl -sSLo kops-1.10.1 https://github.com/kubernetes/kops/releases/download/1.10.1/kops-linux-amd64 && \ + curl -sSfLo kops-1.10.1 https://github.com/kubernetes/kops/releases/download/1.10.1/kops-linux-amd64 && \ chmod a+x kops-1.10.1 && mv kops-1.10.1 /usr/local/bin/ && \ - curl -sSLo kops-1.11.1 https://github.com/kubernetes/kops/releases/download/1.11.1/kops-linux-amd64 && \ + curl -sSfLo kops-1.11.1 https://github.com/kubernetes/kops/releases/download/1.11.1/kops-linux-amd64 && \ chmod a+x kops-1.11.1 && mv kops-1.11.1 /usr/local/bin/ && \ ln -s /usr/local/bin/kops-1.11.1 /usr/local/bin/kops && \ echo "Install kubectl." && \ - curl -sSLo /usr/local/bin/kubectl-1.14.1 https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl && \ + curl -sSfLo /usr/local/bin/kubectl-1.14.1 https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl && \ chmod a+x /usr/local/bin/kubectl-* && \ ln -s /usr/local/bin/kubectl-1.14.1 /usr/local/bin/kubectl && \ echo "Install kubetail." && \ - curl -sSLo kubetail.zip https://github.com/johanhaleby/kubetail/archive/1.6.8.zip && \ + curl -sSfLo kubetail.zip https://github.com/johanhaleby/kubetail/archive/1.6.8.zip && \ unzip -qq kubetail.zip && chmod a+x kubetail-1.6.8/kubetail && mv kubetail-1.6.8/kubetail /usr/local/bin && \ rm -f kubetail.zip && \ echo "Install mc." && \ - curl -sSLo /usr/local/bin/mc https://dl.minio.io/client/mc/release/linux-amd64/mc.RELEASE.2019-04-24T00-09-41Z && \ + curl -sSfLo /usr/local/bin/mc https://dl.minio.io/client/mc/release/linux-amd64/mc.RELEASE.2019-04-24T00-09-41Z && \ chmod a+x /usr/local/bin/mc && \ echo "Install minikube." && \ - curl -sSLo minikube https://storage.googleapis.com/minikube/releases/v1.0.1/minikube-linux-amd64 && \ + curl -sSfLo minikube https://storage.googleapis.com/minikube/releases/v1.0.1/minikube-linux-amd64 && \ chmod a+x minikube && mv minikube /usr/local/bin/ && \ echo "Install terraform." && \ - curl -sSLo terraform.zip https://releases.hashicorp.com/terraform/0.11.13/terraform_0.11.13_linux_amd64.zip && \ + curl -sSfLo terraform.zip https://releases.hashicorp.com/terraform/0.11.13/terraform_0.11.13_linux_amd64.zip && \ unzip -qq terraform.zip && chmod a+x terraform && mv terraform /usr/local/bin && rm -f terraform.zip && \ echo "Install testssl." && \ - curl -sSL https://github.com/drwetter/testssl.sh/archive/v2.9.5-7.tar.gz | tar xz && \ + curl -sSfL https://github.com/drwetter/testssl.sh/archive/v2.9.5-7.tar.gz | tar xz && \ mv testssl* /usr/local/share/testssl && ln -s /usr/local/share/testssl/testssl.sh /usr/local/bin/testssl && chmod a+x /usr/local/bin/testssl && \ echo "Install yadm." && \ - curl -sSL https://github.com/TheLocehiliosan/yadm/archive/1.12.0.tar.gz | tar xz && \ + curl -sSfL https://github.com/TheLocehiliosan/yadm/archive/1.12.0.tar.gz | tar xz && \ mv yadm* /usr/local/share/yadm && ln -s /usr/local/share/yadm/yadm /usr/local/bin/yadm && chmod a+x /usr/local/bin/yadm ####################################### @@ -312,15 +312,15 @@ RUN echo "Clean out /usr/local" && \ rm -rf /usr/local/* RUN echo "Install git (needs to build first as a dependency)." && \ - curl -sSL https://github.com/git/git/archive/v2.19.1.tar.gz | tar xz && cd git-* && \ + curl -sSfL https://github.com/git/git/archive/v2.19.1.tar.gz | tar xz && cd git-* && \ make configure && ./configure --prefix=/usr/local && make && make install && cd .. && rm -fr git-* RUN echo "Install bats" && \ - curl -sSL https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz | tar xz && cd bats-* && \ + curl -sSfL https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz | tar xz && cd bats-* && \ ./install.sh /usr/local && cd .. && rm -fr bats-* RUN echo "Install emacs." && \ - curl -sSL http://mirrors.ibiblio.org/gnu/ftp/gnu/emacs/emacs-26.1.tar.gz | tar xz && cd emacs-* && \ + curl -sSfL http://mirrors.ibiblio.org/gnu/ftp/gnu/emacs/emacs-26.1.tar.gz | tar xz && cd emacs-* && \ CANNOT_DUMP=yes ./configure \ --prefix=/usr/local \ --disable-build-details \ @@ -337,16 +337,16 @@ RUN echo "Install emacs." && \ make && make install && cd .. && rm -fr emacs-* RUN echo "Install jsonnet" && \ - curl -sSL https://github.com/google/jsonnet/archive/v0.12.1.tar.gz | tar xz && cd jsonnet-* && \ + curl -sSfL https://github.com/google/jsonnet/archive/v0.12.1.tar.gz | tar xz && cd jsonnet-* && \ make && chmod a+x jsonnet && mv jsonnet /usr/local/bin RUN echo "Install pyenv with dependencies." && \ - curl -sSLo pyenv-installer https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer && \ + curl -sSfLo pyenv-installer https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer && \ chmod a+x pyenv-installer && mv pyenv-installer /usr/local/bin && \ PYENV_ROOT=/usr/local/pyenv pyenv-installer && chmod -R a+rwx /usr/local/pyenv RUN echo "Install vim." && \ - curl -sSL https://github.com/vim/vim/archive/v8.1.0481.tar.gz | tar xz && cd vim-* && \ + curl -sSfL https://github.com/vim/vim/archive/v8.1.0481.tar.gz | tar xz && cd vim-* && \ ./configure \ --with-features=huge \ --enable-multibyte \ @@ -362,17 +362,17 @@ RUN echo "Install vim." && \ make VIMRUNTIMEDIR=/usr/local/share/vim/vim81 && make install && cd .. && rm -fr vim-* RUN echo "Install tmux." && \ - curl -sSL https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz | tar xz && cd libevent-* && \ + curl -sSfL https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz | tar xz && cd libevent-* && \ ./configure && make && make install && cd .. && rm -fr libevent-* && \ - curl -sSL https://github.com/tmux/tmux/releases/download/2.8/tmux-2.8.tar.gz | tar xz && cd tmux-* && \ + curl -sSfL https://github.com/tmux/tmux/releases/download/2.8/tmux-2.8.tar.gz | tar xz && cd tmux-* && \ ./configure --prefix=/usr/local && make && make install && cd .. && rm -fr tmux-* RUN echo "Install zsh." && \ - curl -sSL https://sourceforge.net/projects/zsh/files/zsh/5.6.2/zsh-5.6.2.tar.xz/download | tar Jx && cd zsh-* && \ + curl -sSfL https://sourceforge.net/projects/zsh/files/zsh/5.6.2/zsh-5.6.2.tar.xz/download | tar Jx && cd zsh-* && \ ./configure --with-tcsetpgrp --prefix=/usr/local && make && make install && echo "/usr/local/bin/zsh" >> /etc/shells && cd .. && rm -fr zsh-* RUN echo "Install redis-cli tools." && \ - curl -sSL http://download.redis.io/releases/redis-5.0.3.tar.gz | tar xz && cd redis-* && \ + curl -sSfL http://download.redis.io/releases/redis-5.0.3.tar.gz | tar xz && cd redis-* && \ make && cp src/redis-cli src/redis-benchmark /usr/local/bin && cd .. && rm -fr redis-*