[docker-io/f20] RHBZ#1105789 - upstream bump to 0.12.0
Lokesh Mandvekar
lsm5 at fedoraproject.org
Mon Jun 9 14:57:54 UTC 2014
commit 6034ed3c5876e0c1e9271767b9de57d666d64bd3
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date: Mon Jun 9 10:23:19 2014 -0400
RHBZ#1105789 - upstream bump to 0.12.0
cgroup.patch | 29 --------
docker-io.spec | 36 ++++++++---
sources | 2 +-
upstream-patched-archive-tar.patch | 126 ++++++++++++++++++++----------------
write-to-proc.patch | 83 -----------------------
5 files changed, 96 insertions(+), 180 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c8e198d..48271c2 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -5,17 +5,15 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit fb99f992c081a1d433c97c99ffb46d12693eeb76
+%global commit 14680bf724161785d164fd99de36e3eb03a823ef
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.11.1
-Release: 7%{?dist}
+Version: 0.12.0
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
-Patch2: write-to-proc.patch
-Patch3: cgroup.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -29,10 +27,12 @@ BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a15a1cdc93db5
BuildRequires: golang >= 1.2-7
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/kr/pty)
+# 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
BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
+# for coreos/go-systemd https://github.com/dotcloud/docker/pull/5981
+BuildRequires: golang(github.com/coreos/go-systemd) >= 2-1
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -64,8 +64,6 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%setup -q -n docker-%{version}
rm -rf vendor
%patch1 -p1 -b upstream-patched-archive-tar
-%patch2 -p1 -b write-to-proc
-%patch3 -p1 -b cgroup
%build
mkdir _build
@@ -155,6 +153,24 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Jun 09 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.12.0-1
+- RHBZ#1105789 Upstream bump to 0.12.0
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jun 05 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-11
+- unitfile should Require socket file (revert change in release 10)
+
+* Fri May 30 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-10
+- do not require docker.socket in unitfile
+
+* Thu May 29 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-9
+- BZ: change systemd service type to 'notify'
+
+* Thu May 29 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-8
+- use systemd socket-activation version
+
* Thu May 29 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-7
- add "Provides: docker" as per FPC exception (Matthew Miller
<mattdm at fedoraproject.org>)
diff --git a/sources b/sources
index 6c0b0dc..54f1744 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz
+800973801b4a833a94485cdc2f28ee30 v0.12.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index 7c3799b..061656a 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,54 +1,54 @@
-diff -uNr docker-0.11.1/archive/archive.go docker-0.11.1-1/archive/archive.go
---- docker-0.11.1/archive/archive.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/archive.go 2014-05-08 11:53:24.197382578 -0400
-@@ -8,7 +8,7 @@
- "fmt"
+diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go
+--- docker-0.12.0/archive/archive.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/archive/archive.go 2014-06-08 17:10:37.537530082 -0400
+@@ -18,7 +18,7 @@
+
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/archive_test.go docker-0.11.1-1/archive/archive_test.go
---- docker-0.11.1/archive/archive_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/archive_test.go 2014-05-08 11:52:50.154420013 -0400
-@@ -3,7 +3,7 @@
- import (
- "bytes"
- "fmt"
+ )
+
+ type (
+diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_test.go
+--- docker-0.12.0/archive/archive_test.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/archive/archive_test.go 2014-06-08 17:09:47.983603103 -0400
+@@ -11,7 +11,7 @@
+ "testing"
+ "time"
+
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/changes.go docker-0.11.1-1/archive/changes.go
---- docker-0.11.1/archive/changes.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/changes.go 2014-05-08 11:53:15.965391535 -0400
-@@ -5,7 +5,7 @@
- "fmt"
+ )
+
+ func TestCmdStreamLargeStderr(t *testing.T) {
+diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go
+--- docker-0.12.0/archive/changes.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/archive/changes.go 2014-06-08 17:10:27.932544229 -0400
+@@ -12,7 +12,7 @@
+
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
- "io"
- "os"
- "path/filepath"
-diff -uNr docker-0.11.1/archive/diff.go docker-0.11.1-1/archive/diff.go
---- docker-0.11.1/archive/diff.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/diff.go 2014-05-08 11:53:05.638403007 -0400
-@@ -2,7 +2,7 @@
+ )
+
+ type ChangeType int
+diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go
+--- docker-0.12.0/archive/diff.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/archive/diff.go 2014-06-08 17:10:20.248555556 -0400
+@@ -9,7 +9,7 @@
+ "strings"
+ "syscall"
- import (
- "fmt"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
---- docker-0.11.1/archive/wrap.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/wrap.go 2014-05-08 11:52:57.609411753 -0400
+ )
+
+ // Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
+diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go
+--- docker-0.12.0/archive/wrap.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/archive/wrap.go 2014-06-08 17:10:11.704568146 -0400
@@ -2,7 +2,7 @@
import (
@@ -58,9 +58,9 @@ diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
"io/ioutil"
)
-diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_test.go
---- docker-0.11.1/graph/tags_unit_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/graph/tags_unit_test.go 2014-05-08 11:53:37.269368203 -0400
+diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_test.go
+--- docker-0.12.0/graph/tags_unit_test.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/graph/tags_unit_test.go 2014-06-08 17:10:48.989513208 -0400
@@ -6,7 +6,7 @@
_ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
"github.com/dotcloud/docker/image"
@@ -70,9 +70,9 @@ diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_
"io"
"os"
"path"
-diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_test.go
---- docker-0.11.1/integration/api_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/integration/api_test.go 2014-05-08 11:53:45.654359060 -0400
+diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_test.go
+--- docker-0.12.0/integration/api_test.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/integration/api_test.go 2014-06-08 17:10:58.148499687 -0400
@@ -21,7 +21,7 @@
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/runconfig"
@@ -82,21 +82,21 @@ diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_
)
func TestGetEvents(t *testing.T) {
-diff -uNr docker-0.11.1/integration/utils_test.go docker-0.11.1-1/integration/utils_test.go
---- docker-0.11.1/integration/utils_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/integration/utils_test.go 2014-05-08 11:53:52.186351827 -0400
-@@ -3,7 +3,7 @@
- import (
- "bytes"
- "fmt"
+diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/utils_test.go
+--- docker-0.12.0/integration/utils_test.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/integration/utils_test.go 2014-06-08 17:11:10.725481190 -0400
+@@ -13,7 +13,7 @@
+ "testing"
+ "time"
+
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
- "io"
- "io/ioutil"
- "net/http"
-diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
---- docker-0.11.1/utils/tarsum.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/utils/tarsum.go 2014-05-08 11:54:02.536340440 -0400
+
+ "github.com/dotcloud/docker/builtins"
+ "github.com/dotcloud/docker/daemon"
+diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go
+--- docker-0.12.0/utils/tarsum.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/utils/tarsum.go 2014-06-08 17:11:19.678468002 -0400
@@ -5,7 +5,7 @@
"compress/gzip"
"crypto/sha256"
@@ -106,3 +106,15 @@ diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
"hash"
"io"
"sort"
+diff -uNr docker-0.12.0/utils/tarsum_test.go docker-0.12.0-1/utils/tarsum_test.go
+--- docker-0.12.0/utils/tarsum_test.go 2014-06-05 20:59:19.000000000 -0400
++++ docker-0.12.0-1/utils/tarsum_test.go 2014-06-08 17:11:43.703432620 -0400
+@@ -4,7 +4,7 @@
+ "bytes"
+ "crypto/rand"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
++ "archive/tar"
+ "io"
+ "io/ioutil"
+ "os"
More information about the scm-commits
mailing list