Add "-f" to curl invocations

This commit is contained in:
Tianon Gravi 2015-05-26 11:38:53 -07:00
parent 14e2d846fb
commit 148c243cc9
3 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ if [ -z "$repo" ]; then
fi fi
IFS=$'\n' IFS=$'\n'
lines=( $(curl -sSL 'https://raw.githubusercontent.com/docker-library/official-images/master/library/'"$repo" | grep -vE '^$|^#') ) lines=( $(curl -fsSL 'https://raw.githubusercontent.com/docker-library/official-images/master/library/'"$repo" | grep -vE '^$|^#') )
unset IFS unset IFS
repoDirs=() repoDirs=()

View File

@ -12,7 +12,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
url='https://raw.githubusercontent.com/docker-library/official-images/master/library/'"$repo" url='https://raw.githubusercontent.com/docker-library/official-images/master/library/'"$repo"
IFS=$'\n' IFS=$'\n'
tags=( $(curl -sSL "$url" | grep -vE '^$|^#' | cut -d':' -f1 | sort -u) ) tags=( $(curl -fsSL "$url" | grep -vE '^$|^#' | cut -d':' -f1 | sort -u) )
unset IFS unset IFS
text= text=
@ -24,12 +24,12 @@ for tag in "${tags[@]}"; do
fi fi
done done
if [ "$text" ]; then if [ "$text" ]; then
latest=($(curl -sSL "$url" | grep "latest.*github.com" | sed -e 's!git://github.com/!!' -e 's/@/ /' -)) latest=($(curl -fsSL "$url" | grep "latest.*github.com" | sed -e 's!git://github.com/!!' -e 's/@/ /' -))
if [ -z "latest" ]; then if [ -z "latest" ]; then
exit 0 # If not github or no latest tag, we are done here exit 0 # If not github or no latest tag, we are done here
fi fi
dockerfile='https://raw.githubusercontent.com/'"${latest[1]}"'/'"${latest[2]}"'/'"${latest[3]}"'/Dockerfile' dockerfile='https://raw.githubusercontent.com/'"${latest[1]}"'/'"${latest[2]}"'/'"${latest[3]}"'/Dockerfile'
baseImage=$(curl -sSL $dockerfile | sed 's/:/\t/' | awk '$1 == "FROM" { print $2 }') baseImage=$(curl -fsSL "$dockerfile" | awk -F '[:[:space:]]+' '$1 == "FROM" { print $2 }')
# give a little space # give a little space
echo echo
echo echo

View File

@ -64,7 +64,7 @@ declare -A otherRepos=(
[websphere-liberty]='https://github.com/WASdev/ci.docker' [websphere-liberty]='https://github.com/WASdev/ci.docker'
) )
dockerLatest="$(curl -sSL 'https://get.docker.com/latest')" dockerLatest="$(curl -fsSL 'https://get.docker.com/latest')"
for repo in "${repos[@]}"; do for repo in "${repos[@]}"; do
if [ -x "$repo/update.sh" ]; then if [ -x "$repo/update.sh" ]; then