commit 96091e34d3ffa2c1797ffdf7e04f8e89d8b98656
Author: Lokesh Mandvekar <[email protected]>
Date: Tue Jan 13 19:27:50 2015 +0000
Resolves: rhbz#1169593 set DOCKER_CERT_PATH
NVR: docker-io-1.4.1-5
- set DOCKER_CERT_PATH=/etc/docker regardless of prior config file value
Signed-off-by: Lokesh Mandvekar <[email protected]>
docker-cert-path.patch | 35 +++++++++++++++++++++++++++++++++++
docker-io.spec | 7 ++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/docker-cert-path.patch b/docker-cert-path.patch
new file mode 100644
index 0000000..62d337c
--- /dev/null
+++ b/docker-cert-path.patch
@@ -0,0 +1,35 @@
+From 2bc25525096c60d32c49c506477e3585e8613182 Mon Sep 17 00:00:00 2001
+From: Jessica Frazelle <[email protected]>
+Date: Tue, 9 Dec 2014 14:18:25 -0800
+Subject: [PATCH] Change cert path to /etc/docker for root user
+
+Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <[email protected]> (github:
jfrazelle)
+---
+ docker/flags.go | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/docker/flags.go b/docker/flags.go
+index 6601b4f..0866519 100644
+--- a/docker/flags.go
++++ b/docker/flags.go
+@@ -3,6 +3,7 @@ package main
+ import (
+ "fmt"
+ "os"
++ "os/user"
+ "path/filepath"
+ "runtime"
+
+@@ -17,7 +18,11 @@ var (
+
+ func init() {
+ if dockerCertPath == "" {
+- dockerCertPath = filepath.Join(getHomeDir(), ".docker")
++ if currentUser, err := user.Current(); err != nil ||
currentUser.Uid == "0" {
++ dockerCertPath = "/etc/docker"
++ } else {
++ dockerCertPath = filepath.Join(getHomeDir(), ".docker")
++ }
+ }
+ }
+
diff --git a/docker-io.spec b/docker-io.spec
index 732b976..ad091e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -17,7 +17,7 @@
Name: %{repo}-io
Version: 1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -30,6 +30,7 @@ Source3: %{repo}-storage.sysconfig
Source4: %{repo}-logrotate.sh
Source5: README.%{repo}-logrotate
Source6: %{repo}-network.sysconfig
+Patch0: %{repo}-cert-path.patch
BuildRequires: glibc-static
BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
@@ -227,6 +228,7 @@ This package installs %{summary}.
%prep
%setup -qn %{repo}-%{version}
rm -rf
vendor/src/github.com/{coreos,docker/libtrust,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
+%patch0 -p1
cp %{SOURCE5} .
%build
@@ -380,6 +382,9 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Tue Jan 13 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-5
+- Resolves: rhbz#1169593 patch to set DOCKER_CERT_PATH regardless of config
file
+
* Thu Jan 08 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-4
- allow unitfile to use /etc/sysconfig/docker-network
- MountFlags private
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
