From 19d67d820ce729fc2678fc22d233416db0e0dc08 Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Tue, 8 Dec 2015 11:59:53 +0100 Subject: [PATCH 1/3] Update Changelog --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index 7f36015..343b83a 100644 --- 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. From d14155691048d046fa0caf4f932b0c5f1727221f Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Tue, 8 Dec 2015 12:01:06 +0100 Subject: [PATCH 2/3] Bump version to 0.9.18 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0adc6ad..2ddba3c 100644 --- 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 From bfd971a0845d80bad840ed036c11319b34c55d5f Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Tue, 8 Dec 2015 12:25:42 +0100 Subject: [PATCH 3/3] Fix test runner: obtain container IP with 'docker inspect' --- test/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner.sh b/test/runner.sh index fd5691a..5b71b71 100755 --- 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