40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2026-02-27 17:41:59 +01:00
Code Issues Releases Wiki Activity

Fix compatibility with latest Ubuntu 12.04 base image.

Browse Source
This commit is contained in:
Hongli Lai (Phusion)
2014-01-31 15:08:06 +01:00
parent 4a3569a9cb
commit 2ac41ee8ab
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@@ -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) ## 0.9.2 (release date: 2013-12-11)
* Fixed SFTP support. Thanks Joris van de Donk! * Fixed SFTP support. Thanks Joris van de Donk!

2
image/prepare.sh
View File

@@ -14,7 +14,7 @@ $minimal_apt_get_install apt-transport-https
## Fix some issues with APT packages. ## Fix some issues with APT packages.
## See https://github.com/dotcloud/docker/issues/1024 ## See https://github.com/dotcloud/docker/issues/1024
dpkg-divert --local --rename --add /sbin/initctl dpkg-divert --local --rename --add /sbin/initctl
ln -s /bin/true /sbin/initctl ln -sf /bin/true /sbin/initctl
## Upgrade all packages. ## Upgrade all packages.
echo "initscripts hold" | dpkg --set-selections echo "initscripts hold" | dpkg --set-selections