From 30d3a3744c16321100c33e593e7fef00b7180ab4 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Fri, 23 Mar 2018 19:44:03 -0400
Subject: [PATCH] update latest versions

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 crio/Dockerfile          |  4 ++--
 gitiles/Dockerfile       |  2 +-
 latest-versions.sh       | 11 ++++++-----
 runc-rootless/Dockerfile |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/crio/Dockerfile b/crio/Dockerfile
index 5aff132..df64b9f 100644
--- a/crio/Dockerfile
+++ b/crio/Dockerfile
@@ -28,8 +28,8 @@ RUN apt-get update && apt-get install -y \
 
 ENV CRIO_VERSION v1.10.0-beta.1
 ENV GO_VERSION 1.9.4
-ENV CNI_PLUGINS_VERSION v0.6.0
-ENV RUNC_VERSION v1.0.0-rc4
+ENV PLUGINS_VERSION v0.7.0
+ENV RUNC_VERSION v0.1.1
 
 # Install CNI plugins
 # Install runc (installs to /sbin/runc)
diff --git a/gitiles/Dockerfile b/gitiles/Dockerfile
index 815b34e..09201ba 100644
--- a/gitiles/Dockerfile
+++ b/gitiles/Dockerfile
@@ -9,7 +9,7 @@ RUN apk add --no-cache \
 	openjdk8
 
 # https://github.com/bazelbuild/bazel/releases
-ENV BAZEL_VERSION 0.5.0
+ENV BAZEL_VERSION 0.11.1
 # https://gerrit.googlesource.com/gitiles/
 ENV GITILES_VERSION v0.2-1
 
diff --git a/latest-versions.sh b/latest-versions.sh
index a29342f..8595f1a 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -37,10 +37,6 @@ get_latest() {
 		dir="couchpotato"
 	elif [[ "$dir" == "cri-o" ]]; then
 		dir="crio"
-	elif [[ "$dir" == "SoftHSMv2" ]]; then
-		dir="golang-softhsm2"
-	elif [[ "$dir" == "bazel" ]]; then
-		dir="gitiles"
 	elif [[ "$dir" == "byte-unixbench" ]]; then
 		dir="unixbench"
 	elif [[ "$dir" == "Tautulli" ]]; then
@@ -55,11 +51,12 @@ get_latest() {
 	local udir=$(echo $dir | awk '{print toupper($0)}')
 	# Replace dashes (-) with underscores (_)
 	udir=${udir//-/_}
+	udir=${udir%/*}
 
 	local current
 	if [[ ! -d "$dir" ]]; then
 		# If the directory does not exist, then grep all for it
-		current=$(grep -m 1 "${udir}_VERSION"  **/Dockerfile | awk '{print $(NF)}')
+		current=$(grep -m 1 "${udir}_VERSION"  **/Dockerfile | head -n 1 | awk '{print $(NF)}')
 	else
 		current=$(cat "${dir}/Dockerfile" | grep -m 1 "${udir}_VERSION" | awk '{print $(NF)}')
 	fi
@@ -100,7 +97,11 @@ hashicorp/consul
 coredns/coredns
 CouchPotato/CouchPotatoServer
 kubernetes-incubator/cri-o
+containernetworking/plugins
+opencontainers/runc
 curl/curl
+google/gitiles
+bazelbuild/bazel
 google/guetzli
 irssi/irssi
 cryptodotis/irssi-otr
diff --git a/runc-rootless/Dockerfile b/runc-rootless/Dockerfile
index 2fc921c..99370d1 100644
--- a/runc-rootless/Dockerfile
+++ b/runc-rootless/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.9-alpine AS runc
-ARG RUNC_VERSION=9f9c96235cc97674e935002fc3d78361b696a69e
+ARG RUNC_VERSION 9f9c96235cc97674e935002fc3d78361b696a69e
 RUN apk add --no-cache \
 	bash \
 	curl \