commit 315c8abcea98951ba4da1d716dd919893e1b9790
Author: Lokesh Mandvekar <[email protected]>
Date: Thu Jan 15 22:44:05 2015 +0000
Patch to set DOCKER_CERT_PATH
NVR: docker-io-1.4.1-3
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 c1e39f9..762345b 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -33,6 +33,7 @@ Source4: docker-network.sysconfig
Source5: docker-logrotate.sh
Source6: README.%{repo}-logrotate
Patch0: 0001-docker-exec-patch-for-older-kernels.patch
+Patch1: docker-cert-path.patch
BuildRequires: glibc-static
BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
@@ -219,6 +220,7 @@ This package installs %{summary}.
%setup -q -n docker-%{version}
cp %{SOURCE6} .
%patch0 -p1
+%patch1 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -391,6 +393,9 @@ fi
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Thu Jan 15 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-3
+- set DOCKER_CERT_PATH outside of sysconfig file
+
* Wed Jan 07 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-2
- don't require fish for fish-completion as it's unavailable
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
