[Bug 1145660] New: [PATCH] Support /etc/sysconfig/docker-storage
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1145660
Bug ID: 1145660
Summary: [PATCH] Support /etc/sysconfig/docker-storage
Product: Fedora
Version: rawhide
Component: docker-io
Assignee: lsm5(a)fedoraproject.org
Reporter: walters(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: admiller(a)redhat.com, golang(a)lists.fedoraproject.org,
hushan.jia(a)gmail.com, jperrin(a)centos.org,
lsm5(a)fedoraproject.org, mattdm(a)redhat.com,
mgoldman(a)redhat.com, s(a)shk.io, thrcka(a)redhat.com,
vbatts(a)redhat.com
Created attachment 940423
--> https://bugzilla.redhat.com/attachment.cgi?id=940423&action=edit
[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
--
You are receiving this mail because:
You are on the CC list for the bug.
9 years, 5 months
[Bug 1149882] New: docker socket not found errors
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1149882
Bug ID: 1149882
Summary: docker socket not found errors
Product: Fedora
Version: 20
Component: docker-io
Assignee: lsm5(a)fedoraproject.org
Reporter: bparees(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: admiller(a)redhat.com, golang(a)lists.fedoraproject.org,
hushan.jia(a)gmail.com, jperrin(a)centos.org,
lsm5(a)fedoraproject.org, mattdm(a)redhat.com,
mgoldman(a)redhat.com, s(a)shk.io, thrcka(a)redhat.com,
vbatts(a)redhat.com
Description of problem:
When run as a service, I frequently run into issues with the
/var/run/docker.sock being reported as not found, but if i shutdown the
service, remove /var/run/docker.sock, and run "docker -d" manually instead, I
have no such problem.
In addition, systemctl start docker does not appear to consistently create
/var/run/docker.sock, though the docker daemon reports as running.
Version-Release number of selected component (if applicable):
docker-io-1.2.0-2.fc20.x86_64
How reproducible:
Intermittent, most consistently recreates when bind mounting the docker socket
into a docker container and trying to perform docker operations from within
that container.
Additional info:
Disabling selinux has no effect on the results.
Sample output:
running as a service:
[bparees@bparees ~]$ ps ax | grep docker
10731 ? Ssl 0:00 /usr/bin/docker -d -H fd:// --selinux-enabled
11021 pts/6 S+ 0:00 grep --color=auto docker
[bparees@bparees ~]$ ls -l /var/run/docker*
-rw-r--r--. 1 root root 5 Oct 6 16:08 /var/run/docker.pid
[bparees@bparees ~]$ docker ps
2014/10/06 16:10:03 Get http:///var/run/docker.sock/v1.14/containers/json: dial
unix /var/run/docker.sock: no such file or directory
restarting manually:
[bparees@bparees ~]$ sudo systemctl stop docker
[sudo] password for bparees:
Warning: Stopping docker, but it can still be activated by:
docker.socket
[bparees@bparees ~]$ sudo docker -d >& /tmp/out &
[1] 11343
[bparees@bparees ~]$ ls -l /var/run/docker.*
-rw-r--r--. 1 root root 5 Oct 6 16:10 /var/run/docker.pid
srw-rw----. 1 root docker 0 Oct 6 16:10 /var/run/docker.sock
[bparees@bparees ~]$ docker ps
CONTAINER ID IMAGE COMMAND CREATED
STATUS PORTS NAMES
--
You are receiving this mail because:
You are on the CC list for the bug.
9 years, 5 months
[docker-io/f21] Remove pandoc from build reqs
by Lokesh Mandvekar
commit aee473eaa88a8a9ddd1eb8e3bf4f6b33cc006518
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 13:42:36 2014 -0700
Remove pandoc from build reqs
NVR: docker-io-1.3.1-2
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a48c491..bcd41da 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -45,7 +45,6 @@ BuildRequires: go-md2man
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
-BuildRequires: pandoc
# Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available
%if 0%{?fedora} >= 21
Requires: systemd-units >= 214
@@ -304,6 +303,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-2
+- Remove pandoc from build reqs
+
* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
- update to v1.3.1
9 years, 6 months
[docker-io] Remove pandoc from build reqs
by Lokesh Mandvekar
commit 4ff89d7be890dd79f3dd9c4f2e9b277c9c78f191
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 13:42:36 2014 -0700
Remove pandoc from build reqs
NVR: docker-io-1.3.1-2
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a48c491..bcd41da 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -45,7 +45,6 @@ BuildRequires: go-md2man
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
-BuildRequires: pandoc
# Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available
%if 0%{?fedora} >= 21
Requires: systemd-units >= 214
@@ -304,6 +303,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-2
+- Remove pandoc from build reqs
+
* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
- update to v1.3.1
9 years, 6 months
[docker-io/f20] Update to v1.3.1
by Lokesh Mandvekar
commit 9b6d1c028ec91b99dcfad07d2d3b7003887d0efa
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 09:26:27 2014 -0700
Update to v1.3.1
NVR: docker-io-1.3.1-1
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
modified: docker-io.spec
deleted: ipmasq.patch
modified: sources
docker-io.spec | 19 +++++++------------
ipmasq.patch | 42 ------------------------------------------
sources | 2 +-
3 files changed, 8 insertions(+), 55 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c8dad6b..a48c491 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,11 +10,11 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
+%global commit 4e9bbfa90054cd730e81b53b2de67a74306afc95
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -25,13 +25,8 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
-Patch0: ipmasq.patch
-# though final name for sysconf/sysvinit files is simply 'docker',
-# having .sysvinit and .sysconfig makes things clear
BuildRequires: glibc-static
-# ensure build uses golang 1.2-7 and above
-# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a1...
-BuildRequires: golang >= 1.2-7
+BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
BuildRequires: golang(github.com/kr/pty) >= 0-0.19
@@ -46,6 +41,7 @@ BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-2
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: golang(github.com/docker/libtrust)
BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+BuildRequires: go-md2man
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
@@ -90,7 +86,6 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-#Provides: golang(%{import_path}/archive) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
@@ -100,7 +95,6 @@ Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-#Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
@@ -172,9 +166,7 @@ rm -rf vendor
find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
-sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh
sed -i 's/\!bash//g' contrib/completion/bash/docker
-%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -312,6 +304,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
+- update to v1.3.1
+
* Mon Oct 20 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.0-1
- Resolves: rhbz#1153936 - update to v1.3.0
- don't install zsh files
diff --git a/sources b/sources
index 31a8c6c..f2eaa15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fb2716980f5602d0fbb7da8cf71f8f6 v1.3.0.tar.gz
+098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz
9 years, 6 months
[docker-io/f21] Update to v1.3.1
by Lokesh Mandvekar
commit e32212476f23ac276ab96e73043b4cda0f30c682
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 09:26:27 2014 -0700
Update to v1.3.1
NVR: docker-io-1.3.1-1
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
modified: docker-io.spec
deleted: ipmasq.patch
modified: sources
docker-io.spec | 19 +++++++------------
ipmasq.patch | 42 ------------------------------------------
sources | 2 +-
3 files changed, 8 insertions(+), 55 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c8dad6b..a48c491 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,11 +10,11 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
+%global commit 4e9bbfa90054cd730e81b53b2de67a74306afc95
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -25,13 +25,8 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
-Patch0: ipmasq.patch
-# though final name for sysconf/sysvinit files is simply 'docker',
-# having .sysvinit and .sysconfig makes things clear
BuildRequires: glibc-static
-# ensure build uses golang 1.2-7 and above
-# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a1...
-BuildRequires: golang >= 1.2-7
+BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
BuildRequires: golang(github.com/kr/pty) >= 0-0.19
@@ -46,6 +41,7 @@ BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-2
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: golang(github.com/docker/libtrust)
BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+BuildRequires: go-md2man
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
@@ -90,7 +86,6 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-#Provides: golang(%{import_path}/archive) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
@@ -100,7 +95,6 @@ Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-#Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
@@ -172,9 +166,7 @@ rm -rf vendor
find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
-sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh
sed -i 's/\!bash//g' contrib/completion/bash/docker
-%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -312,6 +304,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
+- update to v1.3.1
+
* Mon Oct 20 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.0-1
- Resolves: rhbz#1153936 - update to v1.3.0
- don't install zsh files
diff --git a/sources b/sources
index 31a8c6c..f2eaa15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fb2716980f5602d0fbb7da8cf71f8f6 v1.3.0.tar.gz
+098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz
9 years, 6 months
[docker-io] Update to v1.3.1
by Lokesh Mandvekar
commit bf66f5a8b402692cf59f9c21e1185c00127076df
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri Oct 31 09:26:27 2014 -0700
Update to v1.3.1
NVR: docker-io-1.3.1-1
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
modified: docker-io.spec
deleted: ipmasq.patch
modified: sources
docker-io.spec | 19 +++++++------------
ipmasq.patch | 42 ------------------------------------------
sources | 2 +-
3 files changed, 8 insertions(+), 55 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c8dad6b..a48c491 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,11 +10,11 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
+%global commit 4e9bbfa90054cd730e81b53b2de67a74306afc95
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -25,13 +25,8 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
-Patch0: ipmasq.patch
-# though final name for sysconf/sysvinit files is simply 'docker',
-# having .sysvinit and .sysconfig makes things clear
BuildRequires: glibc-static
-# ensure build uses golang 1.2-7 and above
-# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a1...
-BuildRequires: golang >= 1.2-7
+BuildRequires: golang >= 1.3.3
# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950
BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13
BuildRequires: golang(github.com/kr/pty) >= 0-0.19
@@ -46,6 +41,7 @@ BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-2
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
BuildRequires: golang(github.com/docker/libtrust)
BuildRequires: golang(github.com/docker/libtrust/trustgraph)
+BuildRequires: go-md2man
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
@@ -90,7 +86,6 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-#Provides: golang(%{import_path}/archive) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
@@ -100,7 +95,6 @@ Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-#Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
@@ -172,9 +166,7 @@ rm -rf vendor
find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
-sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh
sed -i 's/\!bash//g' contrib/completion/bash/docker
-%patch0 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -312,6 +304,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Fri Oct 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.1-1
+- update to v1.3.1
+
* Mon Oct 20 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.0-1
- Resolves: rhbz#1153936 - update to v1.3.0
- don't install zsh files
diff --git a/sources b/sources
index 31a8c6c..f2eaa15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fb2716980f5602d0fbb7da8cf71f8f6 v1.3.0.tar.gz
+098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz
9 years, 6 months