Merge pull request #182 from infosiftr/whitespace

Fix whitespace, add pgp-happy-eyeballs, and run update.sh

Author: tianon

.travis.yml

@@ -2,9 +2,9 @@ language: bash
 services: docker
 
 env:
-  - VERSION=6 VARIANT=
   - VERSION=6.4.1 VARIANT=
   - VERSION=6.4.0 VARIANT=
+  - VERSION=6 VARIANT=
   - VERSION=5 VARIANT=
   - VERSION=5 VARIANT=alpine
 
@@ -15,12 +15,18 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
+  - cd "$VERSION/$VARIANT"
   - image="elasticsearch:${VERSION}${VARIANT:+-$VARIANT}"
 
 script:
-  - travis_retry docker build -t "$image" "${VARIANT:-.}"
-  - ~/official-images/test/run.sh "$image"
+  - |
+    (
+      set -Eeuo pipefail
+      set -x
+      docker build -t "$image" .
+      ~/official-images/test/run.sh "$image"
+    )
 
 after_script:
   - docker images

update.sh

@@ -41,11 +41,11 @@ for version in "${versions[@]}"; do
 
 		# Parse image manifest for sha
 		authToken="$(curl -fsSL 'https://docker-auth.elastic.co/auth?service=token-service&scope=repository:elasticsearch/elasticsearch:pull' | jq -r .token)"
-        digest="$(curl --head -fsSL -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -H "Authorization: Bearer $authToken" "https://docker.elastic.co/v2/elasticsearch/elasticsearch/manifests/$plainVersion" | tr -d '\r' | gawk -F ':[[:space:]]+' '$1 == "Docker-Content-Digest" { print $2 }')"
-        
-        # Format image reference (image@sha)
-        upstreamImageDigest="$upstreamImage@$digest"
-        
+		digest="$(curl --head -fsSL -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -H "Authorization: Bearer $authToken" "https://docker.elastic.co/v2/elasticsearch/elasticsearch/manifests/$plainVersion" | tr -d '\r' | gawk -F ':[[:space:]]+' '$1 == "Docker-Content-Digest" { print $2 }')"
+
+		# Format image reference (image@sha)
+		upstreamImageDigest="$upstreamImage@$digest"
+
 		(
 			set -x
 			sed '