Merge branch 'next'

borice · Dec 8, 2015 · 6052c7a · 6052c7a
2 parents 14ec533 + bfd971a
commit 6052c7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+## 0.9.18 (release date: 2015-12-08)
+
+ * The latest OpenSSL updates have been pulled in. This fixes [CVE-2015-3193](https://www.openssl.org/news/secadv/20151203.txt) and a few others. Upgrading is strongly recommended.
+
+
 ## 0.9.17 (release date: 2015-07-15)
 
  * The latest OpenSSL updates have been pulled in. This fixes [CVE-2015-1793](http://openssl.org/news/secadv_20150709.txt). Upgrading is strongly recommended.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = phusion/baseimage
-VERSION = 0.9.17
+VERSION = 0.9.18
 
 .PHONY: all build test tag_latest release ssh
 

diff --git a/test/runner.sh b/test/runner.sh
@@ -21,7 +21,7 @@ ID=`docker run -d -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insec
 sleep 1
 
 echo " --> Obtaining IP"
-IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
+IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" "$ID"`
 if [[ "$IP" = "" ]]; then
 	abort "Unable to obtain container IP"
 fi