Skip to content

Commit

Permalink
Now Docker is not PID 1 to reap zombie processes
Browse files Browse the repository at this point in the history
  • Loading branch information
ailispaw committed Oct 30, 2015
1 parent 55c2217 commit 4f2c63f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DockerRoot

DockerRoot (formerly [RancherOS Lite](https://github.com/ailispaw/rancheros-lite)) is a lightweight Linux distribution made with [Buildroot](http://buildroot.uclibc.org/) especially to run a [Docker](https://www.docker.com/) daemon as PID 1.
DockerRoot (formerly [RancherOS Lite](https://github.com/ailispaw/rancheros-lite)) is a lightweight Linux distribution made with [Buildroot](http://buildroot.uclibc.org/) ~~especially to run a [Docker](https://www.docker.com/) daemon as PID 1~~.

It's designed for a local development with Docker in a virtual machine.

Expand All @@ -15,7 +15,7 @@ It's inspired by the following projects.
## Features

- Based on Buildroot 2015.08.1 with Linux kernel v4.1.12 and GLIBC.
- Runs a Docker daemon as PID 1
- ~~Runs a Docker daemon as PID 1~~
- Strip down the Linux kernel modules and drivers
- Busybox + the following utilities from Buildroot
- sudo, bash, wget, xz, sntp
Expand Down
14 changes: 5 additions & 9 deletions overlay/init
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,8 @@ logger -s -p user.info -t "init[$$]" "Configuring sysctl"
sysctl -p /etc/sysctl.conf

logger -s -p user.info -t "init[$$]" "Starting Docker daemon"
if [ -z "${DEBUG}" ]; then
exec /etc/init.d/docker start
else
/etc/init.d/docker start &

set -mb
trap '' SIGCHLD
read
fi
/etc/init.d/docker start &

set -mb
trap '' SIGCHLD
read

0 comments on commit 4f2c63f

Please sign in to comment.