Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch set to support systemd as PID1 in container #13525

Closed
wants to merge 5 commits into from
Closed

Patch set to support systemd as PID1 in container #13525

wants to merge 5 commits into from

Commits on Jul 28, 2015

  1. RegisterMachine truncate container names to first 64 chars 

    Signed-off-by: Sally O'Malley <somalley@redhat.com>

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
    @rhatdan
    rhatdan committed Jul 28, 2015
    Copy the full SHA
    4836835 View commit details
    Browse the repository at this point in the history

  2. Tar up contents of child directory onto tmpfs if mounted over 

    This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

We want to add support for /run and /tmp on tmpfs and Michael Chrosby idea to
add --tmpfs PATH would require a patch like this.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
    @rhatdan
    rhatdan committed Jul 28, 2015
    Copy the full SHA
    91118e5 View commit details
    Browse the repository at this point in the history

  3. Set container_uuid environment variable. 

    This tells systemd what to name the /etc/machine-id file
which links the journald within the container to to external log

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
    @rhatdan
    rhatdan committed Jul 28, 2015
    Copy the full SHA
    7779652 View commit details
    Browse the repository at this point in the history

  4. Add --init=INITSYSTEM option to run the container in different init s… 

    …ystem mode

If you are running a container with an init system like systemd as pid 1 this i
option will modify the default container environment to follow the standard
defined for that init system.

Specifying --init=systemd will run the container with the following changes:

 /run mounted as a tmpfs
 /sys/fs/cgroup volume mounted from the host into the container read-only
 /var/log/journal/UUID volume mounted from the host into the container to allow
journald data from the container to be seen on the host.
 Changes the default signals send from docker stop to the init process (systemd)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
    @rhatdan
    rhatdan committed Jul 28, 2015
    Copy the full SHA
    c9a597b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:docker/docker into systemd 

    Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
    @rhatdan
    rhatdan committed Jul 28, 2015
    Copy the full SHA
    c79fa46 View commit details
    Browse the repository at this point in the history