40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2025-12-30 08:01:31 +01:00
Code Issues Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Hongli Lai (Phusion) 2015-12-08 12:31:34 +01:00
commit 6052c7a3e7
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.md
View File

@ -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) ## 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. * The latest OpenSSL updates have been pulled in. This fixes [CVE-2015-1793](http://openssl.org/news/secadv_20150709.txt). Upgrading is strongly recommended.

2
Makefile
View File

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

2
test/runner.sh
View File

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