From 2ac41ee8ab089394f553ca4f630c24cd677c4cde Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Fri, 31 Jan 2014 15:08:06 +0100 Subject: [PATCH] Fix compatibility with latest Ubuntu 12.04 base image. --- Changelog.md | 4 ++++ image/prepare.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a7052e3..3cbd758 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## 0.9.3 (release date: pending) + + * It looks like Docker changed their Ubuntu 12.04 base image, thereby breaking our Dockerfile. This has been fixed. + ## 0.9.2 (release date: 2013-12-11) * Fixed SFTP support. Thanks Joris van de Donk! diff --git a/image/prepare.sh b/image/prepare.sh index d6c562f..a44937b 100755 --- a/image/prepare.sh +++ b/image/prepare.sh @@ -14,7 +14,7 @@ $minimal_apt_get_install apt-transport-https ## Fix some issues with APT packages. ## See https://github.com/dotcloud/docker/issues/1024 dpkg-divert --local --rename --add /sbin/initctl -ln -s /bin/true /sbin/initctl +ln -sf /bin/true /sbin/initctl ## Upgrade all packages. echo "initscripts hold" | dpkg --set-selections