Package: docker.io
Version: 1.3.1~dfsg1-2
Severity: normal
Dear Maintainer,
Debian is adding support for /etc/default/docker environment file. However,
this file is all commented and don't export any environment variable by
default.
In the idea of a future empty /etc by default, as this file isn't needed to
ensure docker can starts with default options, it would be good to support
that the service can still start without having /etc/default/docker on disk
Please find attach a simple git format-patch changing the patch on unit
file to
support this.
Cheers,
Didier
-- System Information:
Debian Release: jessie/sid
APT prefers vivid-updates
APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500,
'vivid')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-- no debconf information
>From 9e0c7919c60135a2e452c2000badd355da15891e Mon Sep 17 00:00:00 2001
From: Didier Roche <didro...@ubuntu.com>
Date: Thu, 20 Nov 2014 10:38:13 +0100
Subject: [PATCH] Support starting systemd service without env file
---
debian/changelog | 7 +++++++
debian/patches/change-system-unit-env-file.patch | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2c4845f..e1e76e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+docker.io (1.3.1~dfsg1-3) UNRELEASED; urgency=medium
+
+ * debian/patches/change-system-unit-env-file.patch:
+ - support starting systemd service without /etc/default/docker
+
+ -- Didier Roche <didro...@ubuntu.com> Thu, 20 Nov 2014 10:37:25 +0100
+
docker.io (1.3.1~dfsg1-2) unstable; urgency=medium
* Remove deprecated /usr/bin/docker.io symlink
diff --git a/debian/patches/change-system-unit-env-file.patch b/debian/patches/change-system-unit-env-file.patch
index 9e1e94f..c8caac4 100644
--- a/debian/patches/change-system-unit-env-file.patch
+++ b/debian/patches/change-system-unit-env-file.patch
@@ -13,7 +13,7 @@ index 0cb31e3..240961c 100644
[Service]
-ExecStart=/usr/bin/docker -d -H fd://
-+EnvironmentFile=/etc/default/docker
++EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/docker -d -H fd:// $DOCKER_OPTS
LimitNOFILE=1048576
LimitNPROC=1048576
--
2.1.3
