Update to 6.8.1

Author: tianon

6/Dockerfile

@@ -1,10 +1,10 @@
-# Logstash 6.8.0
+# Logstash 6.8.1
 
 # This image re-bundles the Docker image from the upstream provider, Elastic.
-FROM docker.elastic.co/logstash/logstash:6.8.0@sha256:486f5dbe61db4d122bb82699f2237b88587dd9a0eb1f67ee90190659a2988c50
+FROM docker.elastic.co/logstash/logstash:6.8.1@sha256:2280dc3c1deb9d9006cd2a423e09e649ed19109292690f52dd303d0048fc68e1
 
 # The upstream image was built by:
-#   https://github.com/elastic/logstash-docker/tree/6.8.0
+#   https://github.com/elastic/dockerfiles/tree/v6.8.1/logstash
 
 # For a full list of supported images and tags visit https://www.docker.elastic.co
 

update.sh

@@ -47,13 +47,20 @@ for version in "${versions[@]}"; do
 	# Format image reference (image@sha)
 	upstreamImageDigest="$upstreamImage@$digest"
 
-	upstreamDockerfileLink="https://github.com/elastic/logstash-docker/tree/$fullVersion"
+	upstreamDockerfileLink="https://github.com/elastic/dockerfiles/tree/v$fullVersion/logstash"
 	upstreamDockerfile="${upstreamDockerfileLink//tree/raw}/Dockerfile"
 
+	skipDockerfileCheck=
+	if [ "$version" = '7' ]; then
+		# TODO ditch this once 7 moves over to https://github.com/elastic/dockerfiles too?
+		upstreamDockerfileLink="https://github.com/elastic/logstash-docker/tree/$fullVersion"
+		skipDockerfileCheck=1
+	fi
+
 	(
 		set -x
 		curl -fsSL -o /dev/null "$upstreamDockerfileLink" # make sure the upstream Dockerfile link exists
-		# TODO curl -fsSL "$upstreamDockerfile" | grep -P "\Q$fullVersion" # ... and that it contains the right version
+		[ -n "$skipDockerfileCheck" ] || curl -fsSL "$upstreamDockerfile" | grep -P "\Q$fullVersion" # ... and that it contains the right version
 	)
 
 	sed -e 's!%%LOGSTASH_VERSION%%!'"$fullVersion"'!g' \