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

Set the INITRD env variable and make 'ischroot' always return true.

Browse Source 
This prevents initramfs and initscripts updates from breaking.
This commit is contained in:
Hongli Lai (Phusion) 2014-03-25 16:41:56 +01:00
parent 7914d8ac55
commit 0632b4865b
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -1,6 +1,8 @@
## 0.9.9 (not yet released) ## 0.9.9 (not yet released)
* Fixed a problem with rssh. (Slawomir Chodnicki) * Fixed a problem with rssh. (Slawomir Chodnicki)
* The `INITRD` environment variable is now set in the container by default. This prevents updates to the `initramfs` from running grub or lilo.
* The `ischroot` tool in Ubuntu has been modified to always return true. This prevents updates to the `initscripts` package from breaking /dev/shm.
* Various minor bug fixes, improvements and typo corrections. (Felix Hummel, Laurent Sarrazin, Dung Quang, Amir Gur) * Various minor bug fixes, improvements and typo corrections. (Felix Hummel, Laurent Sarrazin, Dung Quang, Amir Gur)
## 0.9.8 (release date: 2014-02-26) ## 0.9.8 (release date: 2014-02-26)

19
image/prepare.sh
View File

@ -6,18 +6,31 @@ set -x
## Temporarily disable dpkg fsync to make building faster. ## Temporarily disable dpkg fsync to make building faster.
echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup
## Prevent initramfs updates from trying to run grub and lilo.
## https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/
## http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189
export INITRD=no
echo -n no > /etc/container_environment.d/INITRD
## Enable Ubuntu Universe and Multiverse. ## Enable Ubuntu Universe and Multiverse.
cp /build/sources.list /etc/apt/sources.list cp /build/sources.list /etc/apt/sources.list
apt-get update apt-get update
## Install HTTPS support for APT.
$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 -sf /bin/true /sbin/initctl ln -sf /bin/true /sbin/initctl
## Replace the 'ischroot' tool to make it always return true.
## Prevent initscripts updates from breaking /dev/shm.
## https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/
## https://bugs.launchpad.net/launchpad/+bug/974584
dpkg-divert --local --rename --add /usr/bin/ischroot
ln -sf /bin/true /usr/bin/ischroot
## Install HTTPS support for APT.
$minimal_apt_get_install apt-transport-https
## Upgrade all packages. ## Upgrade all packages.
echo "initscripts hold" | dpkg --set-selections echo "initscripts hold" | dpkg --set-selections
apt-get upgrade -y --no-install-recommends apt-get upgrade -y --no-install-recommends