[docker-io/el6] import lsm5's latest docker-io SRPM
by Lokesh Mandvekar
commit 281de149b491164ce3c97dec567787bba7aabdf0
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:53:41 2014 -0600
import lsm5's latest docker-io SRPM
docker-io.spec | 29 ++++++----
docker.sysconfig | 1 -
docker.sysvinit | 123 ---------------------------------------------
remove-vendored-tar.patch | 109 +++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 127 insertions(+), 137 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7976363..8b7fbb9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,30 +9,29 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
+%global commit a1598d1e1c157388f3b07415729de28f4d205e49
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
+Patch1: remove-vendored-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
-Source1: docker.sysconfig
-Source2: docker.sysvinit
-Source3: docker.1
+Source1: docker.1
BuildRequires: gcc
BuildRequires: glibc-static
-# ensure build uses golang 1.2 and above
-# https://github.com/dotcloud/docker/issues/3191
-BuildRequires: golang >= 1.2
+# 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(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
@@ -82,6 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
+%patch1 -p1 -b remove-vendored-tar
%build
mkdir _build
@@ -107,7 +107,7 @@ install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
# install manpage
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1
# install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
@@ -130,9 +130,9 @@ install -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
+install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
%endif
%pre
@@ -192,6 +192,11 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Feb 19 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-1
+- Bug 1066841 - upstream version bump to v0.8.1
+- use sysvinit files from upstream contrib
+- BR golang >= 1.2-7
+
* Thu Feb 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.8.0-3
- Remove unneeded sysctl settings in initscript
https://github.com/dotcloud/docker/pull/4125
diff --git a/remove-vendored-tar.patch b/remove-vendored-tar.patch
new file mode 100644
index 0000000..d180bc2
--- /dev/null
+++ b/remove-vendored-tar.patch
@@ -0,0 +1,109 @@
+From 093f9f11373c3414abb30b74b1271a80822f2d90 Mon Sep 17 00:00:00 2001
+From: Lokesh Mandvekar <lsm5(a)redhat.com>
+Date: Wed, 19 Feb 2014 20:49:50 -0500
+Subject: [PATCH] remove vendored tar
+
+---
+ archive/archive.go | 2 +-
+ archive/changes.go | 2 +-
+ archive/diff.go | 2 +-
+ archive/wrap.go | 2 +-
+ integration/api_test.go | 2 +-
+ integration/utils_test.go | 2 +-
+ utils/tarsum.go | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/archive/archive.go b/archive/archive.go
+index 16c0199..817d37e 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/bzip2"
+ "compress/gzip"
+ "errors"
+diff --git a/archive/changes.go b/archive/changes.go
+index b46b13b..25406f5 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "github.com/dotcloud/docker/utils"
+ "io"
+diff --git a/archive/diff.go b/archive/diff.go
+index 6a77839..7bf01f3 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 981420b..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "io/ioutil"
+ )
+
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 5779e6b..e8ef626 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -3,7 +3,7 @@ package docker
+ import (
+ "bufio"
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "encoding/json"
+ "fmt"
+ "github.com/dotcloud/docker"
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 947ace1..59297fa 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -2,7 +2,7 @@ package docker
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index ddeecfb..be8b4db 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -2,7 +2,7 @@ package utils
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+--
+1.9.0
+
diff --git a/sources b/sources
index 4c76ff3..b77c489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz
+3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
10 years, 1 month
[docker-io/f19] import lsm5's latest docker-io SRPM
by Lokesh Mandvekar
commit 4b8288535f979193f4ac600a5fffa46ba44ffd23
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:53:41 2014 -0600
import lsm5's latest docker-io SRPM
docker-io.spec | 29 ++++++----
docker.sysconfig | 1 -
docker.sysvinit | 123 ---------------------------------------------
remove-vendored-tar.patch | 109 +++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 127 insertions(+), 137 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7976363..8b7fbb9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,30 +9,29 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
+%global commit a1598d1e1c157388f3b07415729de28f4d205e49
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
+Patch1: remove-vendored-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
-Source1: docker.sysconfig
-Source2: docker.sysvinit
-Source3: docker.1
+Source1: docker.1
BuildRequires: gcc
BuildRequires: glibc-static
-# ensure build uses golang 1.2 and above
-# https://github.com/dotcloud/docker/issues/3191
-BuildRequires: golang >= 1.2
+# 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(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
@@ -82,6 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
+%patch1 -p1 -b remove-vendored-tar
%build
mkdir _build
@@ -107,7 +107,7 @@ install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
# install manpage
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1
# install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
@@ -130,9 +130,9 @@ install -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
+install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
%endif
%pre
@@ -192,6 +192,11 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Feb 19 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-1
+- Bug 1066841 - upstream version bump to v0.8.1
+- use sysvinit files from upstream contrib
+- BR golang >= 1.2-7
+
* Thu Feb 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.8.0-3
- Remove unneeded sysctl settings in initscript
https://github.com/dotcloud/docker/pull/4125
diff --git a/remove-vendored-tar.patch b/remove-vendored-tar.patch
new file mode 100644
index 0000000..d180bc2
--- /dev/null
+++ b/remove-vendored-tar.patch
@@ -0,0 +1,109 @@
+From 093f9f11373c3414abb30b74b1271a80822f2d90 Mon Sep 17 00:00:00 2001
+From: Lokesh Mandvekar <lsm5(a)redhat.com>
+Date: Wed, 19 Feb 2014 20:49:50 -0500
+Subject: [PATCH] remove vendored tar
+
+---
+ archive/archive.go | 2 +-
+ archive/changes.go | 2 +-
+ archive/diff.go | 2 +-
+ archive/wrap.go | 2 +-
+ integration/api_test.go | 2 +-
+ integration/utils_test.go | 2 +-
+ utils/tarsum.go | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/archive/archive.go b/archive/archive.go
+index 16c0199..817d37e 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/bzip2"
+ "compress/gzip"
+ "errors"
+diff --git a/archive/changes.go b/archive/changes.go
+index b46b13b..25406f5 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "github.com/dotcloud/docker/utils"
+ "io"
+diff --git a/archive/diff.go b/archive/diff.go
+index 6a77839..7bf01f3 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 981420b..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "io/ioutil"
+ )
+
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 5779e6b..e8ef626 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -3,7 +3,7 @@ package docker
+ import (
+ "bufio"
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "encoding/json"
+ "fmt"
+ "github.com/dotcloud/docker"
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 947ace1..59297fa 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -2,7 +2,7 @@ package docker
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index ddeecfb..be8b4db 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -2,7 +2,7 @@ package utils
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+--
+1.9.0
+
diff --git a/sources b/sources
index 4c76ff3..b77c489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz
+3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
10 years, 1 month
[docker-io/f20] import lsm5's latest docker-io SRPM
by Lokesh Mandvekar
commit 81e1cbf0e2ccf11c29dbdfe18fb725f1f7172a39
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:53:41 2014 -0600
import lsm5's latest docker-io SRPM
docker-io.spec | 29 ++++++----
docker.sysconfig | 1 -
docker.sysvinit | 123 ---------------------------------------------
remove-vendored-tar.patch | 109 +++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 127 insertions(+), 137 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7976363..8b7fbb9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,30 +9,29 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
+%global commit a1598d1e1c157388f3b07415729de28f4d205e49
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
+Patch1: remove-vendored-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
-Source1: docker.sysconfig
-Source2: docker.sysvinit
-Source3: docker.1
+Source1: docker.1
BuildRequires: gcc
BuildRequires: glibc-static
-# ensure build uses golang 1.2 and above
-# https://github.com/dotcloud/docker/issues/3191
-BuildRequires: golang >= 1.2
+# 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(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
@@ -82,6 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
+%patch1 -p1 -b remove-vendored-tar
%build
mkdir _build
@@ -107,7 +107,7 @@ install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
# install manpage
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1
# install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
@@ -130,9 +130,9 @@ install -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
+install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
%endif
%pre
@@ -192,6 +192,11 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Feb 19 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-1
+- Bug 1066841 - upstream version bump to v0.8.1
+- use sysvinit files from upstream contrib
+- BR golang >= 1.2-7
+
* Thu Feb 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.8.0-3
- Remove unneeded sysctl settings in initscript
https://github.com/dotcloud/docker/pull/4125
diff --git a/remove-vendored-tar.patch b/remove-vendored-tar.patch
new file mode 100644
index 0000000..d180bc2
--- /dev/null
+++ b/remove-vendored-tar.patch
@@ -0,0 +1,109 @@
+From 093f9f11373c3414abb30b74b1271a80822f2d90 Mon Sep 17 00:00:00 2001
+From: Lokesh Mandvekar <lsm5(a)redhat.com>
+Date: Wed, 19 Feb 2014 20:49:50 -0500
+Subject: [PATCH] remove vendored tar
+
+---
+ archive/archive.go | 2 +-
+ archive/changes.go | 2 +-
+ archive/diff.go | 2 +-
+ archive/wrap.go | 2 +-
+ integration/api_test.go | 2 +-
+ integration/utils_test.go | 2 +-
+ utils/tarsum.go | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/archive/archive.go b/archive/archive.go
+index 16c0199..817d37e 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/bzip2"
+ "compress/gzip"
+ "errors"
+diff --git a/archive/changes.go b/archive/changes.go
+index b46b13b..25406f5 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "github.com/dotcloud/docker/utils"
+ "io"
+diff --git a/archive/diff.go b/archive/diff.go
+index 6a77839..7bf01f3 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 981420b..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "io/ioutil"
+ )
+
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 5779e6b..e8ef626 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -3,7 +3,7 @@ package docker
+ import (
+ "bufio"
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "encoding/json"
+ "fmt"
+ "github.com/dotcloud/docker"
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 947ace1..59297fa 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -2,7 +2,7 @@ package docker
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index ddeecfb..be8b4db 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -2,7 +2,7 @@ package utils
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+--
+1.9.0
+
diff --git a/sources b/sources
index 4c76ff3..b77c489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz
+3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
10 years, 1 month
[Bug 1065001] New: Starting docker service removes IPv6 default route
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1065001
Bug ID: 1065001
Summary: Starting docker service removes IPv6 default route
Product: Fedora EPEL
Version: el6
Component: docker-io
Assignee: lsm5(a)redhat.com
Reporter: redhat(a)subs.maneos.org
QA Contact: extras-qa(a)fedoraproject.org
CC: admiller(a)redhat.com, golang(a)lists.fedoraproject.org,
lsm5(a)redhat.com, mattdm(a)redhat.com,
mgoldman(a)redhat.com, skottler(a)redhat.com,
vbatts(a)redhat.com
Description of problem:
The docker init script does this:
preexec="/sbin/sysctl"
[ -x $preexec ] || exit 6
$preexec -w net.ipv4.ip_forward=1 > /dev/null 2>&1
$preexec -w net.ipv6.conf.all.forwarding=1 > /dev/null 2>&1
These two settings are not quite equivalent. In particular,
net.ipv6.conf.all.forwarding=1 disables autoconfiguration.
Version-Release number of selected component (if applicable):
0.7.6-2.el6
How reproducible:
Steps to Reproduce:
1. Start with a host using stateless IPV6 networking configuration.
2. Install docker-io.
3. Start docker-io service.
Actual results:
Loss of ::/0 route (previously auto-configured via a router advertisment).
Expected results:
No changes in routing table.
Additional info:
According to Documentation/networking/ip-sysctl.txt setting
net.ipv6.conf.xxx.accept_ra to 2 should re-enable it for that interface but
that doesn't seem to work for me.
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 1 month
[Bug 1061433] New: unable to remove containers after update
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1061433
Bug ID: 1061433
Summary: unable to remove containers after update
Product: Fedora EPEL
Version: el6
Component: docker-io
Assignee: lsm5(a)redhat.com
Reporter: admiller(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: golang(a)lists.fedoraproject.org, lsm5(a)redhat.com,
mattdm(a)redhat.com, mgoldman(a)redhat.com,
skottler(a)redhat.com, vbatts(a)redhat.com
$ yum update docker-io --enablerepo=epel-testing
Loaded plugins: fastestmirror, security
Loading mirror speeds from cached hostfile
epel/metalink
| 14 kB 00:00
epel-testing/metalink
| 13 kB 00:00
* base: mirrors.syringanetworks.net
* epel: fedora-epel.mirror.lstn.net
* epel-testing: fedora-epel.mirror.lstn.net
* extras: mirror.unl.edu
* updates: mirror.raystedman.net
base
| 3.7 kB 00:00
epel
| 4.2 kB 00:00
epel/primary_db
| 5.9 MB 00:03
epel-testing
| 4.2 kB 00:00
epel-testing/primary_db
| 354 kB 00:00
extras
| 3.4 kB 00:00
updates
| 3.4 kB 00:00
updates/primary_db
| 1.4 MB 00:00
Setting up Update Process
Resolving Dependencies
--> Running transaction check
---> Package docker-io.x86_64 0:0.7.2-2.el6 will be updated
---> Package docker-io.x86_64 0:0.7.6-2.el6 will be an update
--> Finished Dependency Resolution
Dependencies Resolved
=================================================================================================================
Package Arch Version
Repository Size
=================================================================================================================
Updating:
docker-io x86_64 0.7.6-2.el6
epel-testing 3.4 M
Transaction Summary
=================================================================================================================
Upgrade 1 Package(s)
Total download size: 3.4 M
Is this ok [y/N]: y
Downloading Packages:
docker-io-0.7.6-2.el6.x86_64.rpm
| 3.4 MB 00:01
Running rpm_check_debug
Running Transaction Test
Transaction Test Succeeded
Running Transaction
Updating : docker-io-0.7.6-2.el6.x86_64
1/2
Cleanup : docker-io-0.7.2-2.el6.x86_64
2/2
Verifying : docker-io-0.7.6-2.el6.x86_64
1/2
Verifying : docker-io-0.7.2-2.el6.x86_64
2/2
Updated:
docker-io.x86_64 0:0.7.6-2.el6
Complete!
$ service docker restart
Stopping docker: [FAILED]
Starting docker: [ OK ]
$ docker ps
CONTAINER ID IMAGE COMMAND CREATED
STATUS PORTS NAMES
cf954960224a fedora:20 /bin/bash 11 days ago
Up About an hour high_nobel
$ docker rm
7fde91c0e432 89fcd3faa5a6
$ docker rm 7fde91c0e432 89fcd3faa5a6
Error: Cannot destroy container 7fde91c0e432: Driver devicemapper failed to
remove root filesystem
7fde91c0e43298f05d71ac75598706ef63063a7b2e5a1da1617797f581586de8: device or
resource busy
Error: Cannot destroy container 89fcd3faa5a6: Driver devicemapper failed to
remove root filesystem
89fcd3faa5a65c8415f2f88b402e26da003108362ded3760ff3fcdbb917d0a55: device or
resource busy
2014/02/04 13:53:20 Error: failed to remove one or more containers
$ docker ps -a
CONTAINER ID IMAGE COMMAND CREATED
STATUS PORTS NAMES
89fcd3faa5a6 centos:6.4 /bin/bash 10 days ago
Exit 255 test_libevent_tmux
7fde91c0e432 fedora:rawhide /bin/bash 11 days ago
Exit 255 rawhide
cf954960224a fedora:20 /bin/bash 11 days ago
Up About an hour high_nobel
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 1 month
[Bug 1061431] New: containers are inaccessible after upgrade
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1061431
Bug ID: 1061431
Summary: containers are inaccessible after upgrade
Product: Fedora EPEL
Version: el6
Component: docker-io
Assignee: lsm5(a)redhat.com
Reporter: admiller(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: golang(a)lists.fedoraproject.org, lsm5(a)redhat.com,
mattdm(a)redhat.com, mgoldman(a)redhat.com,
skottler(a)redhat.com, vbatts(a)redhat.com
Description of problem:
$ yum update docker-io --enablerepo=epel-testing
Loaded plugins: fastestmirror, security
Loading mirror speeds from cached hostfile
epel/metalink
| 14 kB 00:00
epel-testing/metalink
| 13 kB 00:00
* base: mirrors.syringanetworks.net
* epel: fedora-epel.mirror.lstn.net
* epel-testing: fedora-epel.mirror.lstn.net
* extras: mirror.unl.edu
* updates: mirror.raystedman.net
base
| 3.7 kB 00:00
epel
| 4.2 kB 00:00
epel/primary_db
| 5.9 MB 00:03
epel-testing
| 4.2 kB 00:00
epel-testing/primary_db
| 354 kB 00:00
extras
| 3.4 kB 00:00
updates
| 3.4 kB 00:00
updates/primary_db
| 1.4 MB 00:00
Setting up Update Process
Resolving Dependencies
--> Running transaction check
---> Package docker-io.x86_64 0:0.7.2-2.el6 will be updated
---> Package docker-io.x86_64 0:0.7.6-2.el6 will be an update
--> Finished Dependency Resolution
Dependencies Resolved
=================================================================================================================
Package Arch Version
Repository Size
=================================================================================================================
Updating:
docker-io x86_64 0.7.6-2.el6
epel-testing 3.4 M
Transaction Summary
=================================================================================================================
Upgrade 1 Package(s)
Total download size: 3.4 M
Is this ok [y/N]: y
Downloading Packages:
docker-io-0.7.6-2.el6.x86_64.rpm
| 3.4 MB 00:01
Running rpm_check_debug
Running Transaction Test
Transaction Test Succeeded
Running Transaction
Updating : docker-io-0.7.6-2.el6.x86_64
1/2
Cleanup : docker-io-0.7.2-2.el6.x86_64
2/2
Verifying : docker-io-0.7.6-2.el6.x86_64
1/2
Verifying : docker-io-0.7.2-2.el6.x86_64
2/2
Updated:
docker-io.x86_64 0:0.7.6-2.el6
Complete!
$ service docker restart
Stopping docker: [FAILED]
Starting docker: [ OK ]
$ docker ps -a
CONTAINER ID IMAGE COMMAND CREATED
STATUS PORTS NAMES
ab0e4ba814ab centos:6.4 /bin/bash 5 days ago
Ghost angry_euclide
89fcd3faa5a6 centos:6.4 /bin/bash 10 days ago
Exit 255 test_libevent_tmux
7fde91c0e432 fedora:rawhide /bin/bash 11 days ago
Exit 255 rawhide
cf954960224a fedora:20 /bin/bash 11 days ago
Exit 255 high_nobel
$ docker start 7fde91c0e432
Error: start: Cannot start container 7fde91c0e432: no such file or directory
2014/02/04 12:15:36 Error: failed to start one or more containers
$ docker start 89fcd3faa5a6
Error: start: Cannot start container 89fcd3faa5a6: no such file or directory
2014/02/04 12:15:40 Error: failed to start one or more containers
$ docker attach ab0e4ba814ab
[error] commands.go:2475 Error resize: Error: resize: ptyMaster does not have
Fd() method
Error: Impossible to attach to a ghost container
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 1 month
[docker-io] import lsm5's latest docker-io SRPM
by Adam Miller
commit 88ba8d93be01bd8d535ec96994df98793dabfed9
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:53:41 2014 -0600
import lsm5's latest docker-io SRPM
docker-io.spec | 29 ++++++----
docker.sysconfig | 1 -
docker.sysvinit | 123 ---------------------------------------------
remove-vendored-tar.patch | 109 +++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 127 insertions(+), 137 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7976363..8b7fbb9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,30 +9,29 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
+%global commit a1598d1e1c157388f3b07415729de28f4d205e49
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
+Patch1: remove-vendored-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
-Source1: docker.sysconfig
-Source2: docker.sysvinit
-Source3: docker.1
+Source1: docker.1
BuildRequires: gcc
BuildRequires: glibc-static
-# ensure build uses golang 1.2 and above
-# https://github.com/dotcloud/docker/issues/3191
-BuildRequires: golang >= 1.2
+# 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(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
@@ -82,6 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
+%patch1 -p1 -b remove-vendored-tar
%build
mkdir _build
@@ -107,7 +107,7 @@ install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
# install manpage
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1
# install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
@@ -130,9 +130,9 @@ install -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
+install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
%endif
%pre
@@ -192,6 +192,11 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Feb 19 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-1
+- Bug 1066841 - upstream version bump to v0.8.1
+- use sysvinit files from upstream contrib
+- BR golang >= 1.2-7
+
* Thu Feb 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.8.0-3
- Remove unneeded sysctl settings in initscript
https://github.com/dotcloud/docker/pull/4125
diff --git a/remove-vendored-tar.patch b/remove-vendored-tar.patch
new file mode 100644
index 0000000..d180bc2
--- /dev/null
+++ b/remove-vendored-tar.patch
@@ -0,0 +1,109 @@
+From 093f9f11373c3414abb30b74b1271a80822f2d90 Mon Sep 17 00:00:00 2001
+From: Lokesh Mandvekar <lsm5(a)redhat.com>
+Date: Wed, 19 Feb 2014 20:49:50 -0500
+Subject: [PATCH] remove vendored tar
+
+---
+ archive/archive.go | 2 +-
+ archive/changes.go | 2 +-
+ archive/diff.go | 2 +-
+ archive/wrap.go | 2 +-
+ integration/api_test.go | 2 +-
+ integration/utils_test.go | 2 +-
+ utils/tarsum.go | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/archive/archive.go b/archive/archive.go
+index 16c0199..817d37e 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/bzip2"
+ "compress/gzip"
+ "errors"
+diff --git a/archive/changes.go b/archive/changes.go
+index b46b13b..25406f5 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "github.com/dotcloud/docker/utils"
+ "io"
+diff --git a/archive/diff.go b/archive/diff.go
+index 6a77839..7bf01f3 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -1,7 +1,7 @@
+ package archive
+
+ import (
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 981420b..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "io/ioutil"
+ )
+
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 5779e6b..e8ef626 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -3,7 +3,7 @@ package docker
+ import (
+ "bufio"
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "encoding/json"
+ "fmt"
+ "github.com/dotcloud/docker"
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 947ace1..59297fa 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -2,7 +2,7 @@ package docker
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "fmt"
+ "io"
+ "io/ioutil"
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index ddeecfb..be8b4db 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -2,7 +2,7 @@ package utils
+
+ import (
+ "bytes"
+- "code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+--
+1.9.0
+
diff --git a/sources b/sources
index 4c76ff3..b77c489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz
+3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
10 years, 2 months
[golang/f20: 5/5] Merge branch 'master' into f20
by Adam Miller
commit 8a8b586b8d3bb34089c40428f0510fbc15b17a78
Merge: 5253fbf 64f9c14
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:06:09 2014 -0600
Merge branch 'master' into f20
* master:
fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
update hostname patch
fix patchlevel for patch200
re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
golang-1.2-BSD-SVID-SOURCE.patch | 31 +++++++++++++++++++++++++++++++
golang-f21-hostname.patch | 10 ++++------
golang.spec | 31 ++++++++++++++++++++++---------
3 files changed, 57 insertions(+), 15 deletions(-)
---
10 years, 2 months
[golang/f20] (5 commits) ...Merge branch 'master' into f20
by Adam Miller
Summary of changes:
d0ddbae... re-order some patches, remove unneeded glibc deprecated mac (*)
969848f... fix patchlevel for patch200 (*)
a9aa183... update hostname patch (*)
64f9c14... fix BSD/SVID patch, and fix up changelog entry (rpmlint was (*)
8a8b586... Merge branch 'master' into f20
(*) This commit already existed in another branch; no separate mail sent
10 years, 2 months