Attachment 940423 Details for Bug 1145660 – [PATCH] Support /etc/sysconfig/docker-storage

[patch] [PATCH] Support /etc/sysconfig/docker-storage

0001-Support-etc-sysconfig-docker-storage.patch (text/plain), 3.07 KB, created by Colin Walters on 2014-09-23 12:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2014-09-23 12:58:52 UTC

Size: 3.07 KB

patch

obsolete

>From ad6957e21d00a39dc31a6b96663babf900e0b727 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Thu, 18 Sep 2014 22:08:25 -0400
>Subject: [PATCH] Support /etc/sysconfig/docker-storage
>
>This will allow installation programs to pre-configure storage easily.
>It will be used by Atomic to set up Docker for direct LVM.
>---
> docker-storage.sysconfig | 14 ++++++++++++++
> docker.service           |  3 ++-
> docker.spec              |  5 ++++-
> 3 files changed, 20 insertions(+), 2 deletions(-)
> create mode 100644 docker-storage.sysconfig
>
>diff --git a/docker-storage.sysconfig b/docker-storage.sysconfig
>new file mode 100644
>index 0000000..3dc1654
>--- /dev/null
>+++ b/docker-storage.sysconfig
>@@ -0,0 +1,14 @@
>+# This file may be automatically generated by an installation program.
>+
>+# By default, Docker uses a loopback-mounted sparse file in
>+# /var/lib/docker.  The loopback makes it slower, and there are some
>+# restrictive defaults, such as 100GB max storage.
>+
>+# If your installation did not set a custom storage for Docker, you
>+# may do it below.
>+
>+# Example: Use a custom pair of raw logical volumes (one for metadata,
>+# one for data).
>+# DOCKER_STORAGE_OPTIONS = --storage-opt dm.metadatadev=/dev/mylogvol/my-docker-metadata --storage-opt dm.datadev=/dev/mylogvol/my-docker-data
>+
>+DOCKER_STORAGE_OPTIONS=
>diff --git a/docker.service b/docker.service
>index 739d599..c028656 100644
>--- a/docker.service
>+++ b/docker.service
>@@ -7,7 +7,8 @@ Requires=docker.socket
> [Service]
> Type=notify
> EnvironmentFile=-/etc/sysconfig/docker
>-ExecStart=/usr/bin/docker -d $OPTIONS
>+EnvironmentFile=-/etc/sysconfig/docker-storage
>+ExecStart=/usr/bin/docker -d $OPTIONS $DOCKER_STORAGE_OPTIONS
> Restart=on-failure
> LimitNOFILE=1048576
> LimitNPROC=1048576
>diff --git a/docker.spec b/docker.spec
>index d04f438..c619c41 100644
>--- a/docker.spec
>+++ b/docker.spec
>@@ -11,7 +11,7 @@
> 
> Name:           docker
> Version:        1.2.0
>-Release:        15%{?dist}
>+Release:        16.atomic.1%{?dist}
> Summary:        Automates deployment of containerized applications
> License:        ASL 2.0
> 
>@@ -29,6 +29,7 @@ Source3:        docker.sysconfig
> # docker: systemd socket activation results in privilege escalation
> Source4:        docker.socket
> Source5:        codegansta.tgz
>+Source6:        docker-storage.sysconfig
> BuildRequires:  gcc
> BuildRequires:  glibc-static
> # ensure build uses golang 1.2-7 and above
>@@ -208,6 +209,7 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
> # for additional args
> install -d %{buildroot}%{_sysconfdir}/sysconfig/
> install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker
>+install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
> 
> # install secrets dir
> install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
>@@ -276,6 +278,7 @@ exit 0
> %{_unitdir}/docker.service
> %{_unitdir}/docker.socket
> %config(noreplace) %{_sysconfdir}/sysconfig/docker
>+%config(noreplace) %{_sysconfdir}/sysconfig/docker-storage
> %{_sysconfdir}/docker/certs.d
> #%{_sysconfdir}/docker/certs.d/redhat.com
> #%{_sysconfdir}/docker/certs.d/redhat.com/redhat-ca.crt
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1145660: 940423