[docker-io/epel7] include manpages from contrib
by Lokesh Mandvekar
commit eb17bfdea61a8806f5342aa271e08a6811ac6850
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 11:24:22 2014 -0400
include manpages from contrib
docker-io.spec | 12 +-
docker.1 | 1536 --------------------------------------------------------
2 files changed, 7 insertions(+), 1541 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ee36857..400fb64 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -28,7 +28,6 @@ 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.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -37,7 +36,7 @@ BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -113,7 +112,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 %{SOURCE1} %{buildroot}%{_mandir}/man1
+install -p -m 644 contrib/man/man1/docker*.1 %{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
@@ -174,7 +173,7 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%doc LICENSE-vim-syntax README-vim-syntax.md
-%{_mandir}/man1/docker.1.gz
+%{_mandir}/man1/docker*.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
@@ -198,10 +197,13 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
+- include manpages from contrib
+
* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
- Upstream version bump
-* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
+* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1
- BZ 1080799 - upstream version bump
* Thu Mar 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.9.0-3
10 years, 1 month
[docker-io/epel7] Update to new upstream release 0.10.0
by Lokesh Mandvekar
commit 67879604e6904dea8025babab06d31af302a687a
Author: Bobby Powers <bobbypowers(a)gmail.com>
Date: Thu Apr 10 14:25:01 2014 -0700
Update to new upstream release 0.10.0
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 7 ++-
sources | 2 +-
upstream-patched-archive-tar.patch | 105 +++++++++++++++++++----------------
3 files changed, 64 insertions(+), 50 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cc76e69..ee36857 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -13,7 +13,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.9.1
+Version: 0.10.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -36,6 +36,8 @@ BuildRequires: glibc-static
BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
+BuildRequires: golang(github.com/godbus/dbus)
+BuildRequires: golang(github.com/coreos/go-systemd)
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -196,6 +198,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
+- Upstream version bump
+
* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
- BZ 1080799 - upstream version bump
diff --git a/sources b/sources
index e5765a9..8f84b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-194ee07653abb984bbbab0cf0f3b98f3 v0.9.1.tar.gz
+1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index b0fd2fd..225b1ab 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,7 +1,8 @@
-diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
---- docker-0.9.0/archive/archive.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive.go 2014-03-11 10:35:04.577207349 -0400
-@@ -8,7 +8,7 @@
+diff --git a/archive/archive.go b/archive/archive.go
+index 2fac18e..634e9c1 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -8,7 +8,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -10,10 +11,11 @@ diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_test.go
---- docker-0.9.0/archive/archive_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive_test.go 2014-03-11 10:34:03.705484166 -0400
-@@ -3,7 +3,7 @@
+diff --git a/archive/archive_test.go b/archive/archive_test.go
+index 4126601..ca5a80c 100644
+--- a/archive/archive_test.go
++++ b/archive/archive_test.go
+@@ -3,7 +3,7 @@ package archive
import (
"bytes"
"fmt"
@@ -22,10 +24,11 @@ diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_te
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
---- docker-0.9.0/archive/changes.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/changes.go 2014-03-11 10:34:40.196318221 -0400
-@@ -5,7 +5,7 @@
+diff --git a/archive/changes.go b/archive/changes.go
+index 723e4a7..51baa22 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -34,10 +37,11 @@ diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
"io"
"os"
"path/filepath"
-diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
---- docker-0.9.0/archive/diff.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/diff.go 2014-03-11 10:34:25.722384042 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/diff.go b/archive/diff.go
+index e20e4b1..a67b48a 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -2,7 +2,7 @@ package archive
import (
"fmt"
@@ -46,10 +50,11 @@ diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
---- docker-0.9.0/archive/wrap.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/wrap.go 2014-03-11 10:34:15.296431455 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 03ea508..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
import (
"bytes"
@@ -58,22 +63,37 @@ diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
"io/ioutil"
)
-diff -uNr docker-0.9.0/integration/api_test.go docker-0.9.0-1/integration/api_test.go
---- docker-0.9.0/integration/api_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/api_test.go 2014-03-11 10:35:17.048150637 -0400
-@@ -11,7 +11,7 @@
- "github.com/dotcloud/docker/engine"
- "github.com/dotcloud/docker/runconfig"
+diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
+index 1777391..5cfe4c2 100644
+--- a/graph/tags_unit_test.go
++++ b/graph/tags_unit_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/dotcloud/docker/runtime/graphdriver"
+ _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
+ "archive/tar"
"io"
- "io/ioutil"
- "net"
-diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/utils_test.go
---- docker-0.9.0/integration/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/utils_test.go 2014-03-11 10:35:31.429085241 -0400
-@@ -3,7 +3,7 @@
+ "os"
+ "path"
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 26441a2..a313382 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -21,7 +21,7 @@ import (
+ "github.com/dotcloud/docker/runconfig"
+ "github.com/dotcloud/docker/runtime"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ )
+
+ func TestGetEvents(t *testing.T) {
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 8ad6ccb..5b16f2a 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -3,7 +3,7 @@ package docker
import (
"bytes"
"fmt"
@@ -82,10 +102,11 @@ diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/util
"io"
"io/ioutil"
"net/http"
-diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
---- docker-0.9.0/utils/tarsum.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils/tarsum.go 2014-03-11 10:35:44.731024753 -0400
-@@ -5,7 +5,7 @@
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index 67e94aa..5132194 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -5,7 +5,7 @@ import (
"compress/gzip"
"crypto/sha256"
"encoding/hex"
@@ -94,15 +115,3 @@ diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
"hash"
"io"
"sort"
-diff -uNr docker-0.9.0/utils_test.go docker-0.9.0-1/utils_test.go
---- docker-0.9.0/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils_test.go 2014-03-11 10:35:55.151977365 -0400
-@@ -2,7 +2,7 @@
-
- import (
- "bytes"
-- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
-+ "archive/tar"
- "io"
- )
-
10 years, 1 month
[docker-io/f19] update commit value, regenerate epel btrfs removal patch
by Lokesh Mandvekar
commit 3c83b610dbff14a2f6f02c2017bdee5cf910810d
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 12:29:53 2014 -0400
update commit value, regenerate epel btrfs removal patch
docker-io.spec | 8 +++++-
ignore-btrfs-for-rhel.patch | 45 ++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 400fb64..cd576f9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 867b2a90c228f62cdcd44907ceef279a2d8f1ac5
+%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -197,6 +197,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+- regenerate btrfs removal patch
+- update commit value
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
- include manpages from contrib
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index ca3bc79..5a14235 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,8 +1,6 @@
-diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
-deleted file mode 100644
-index 592e058..0000000
---- a/graphdriver/btrfs/btrfs.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -17,7 +15,7 @@ index 592e058..0000000
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/graphdriver"
+- "github.com/dotcloud/docker/runtime/graphdriver"
- "os"
- "path"
- "syscall"
@@ -86,7 +84,7 @@ index 592e058..0000000
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string) error {
+-func subvolCreate(path, name string, mountLabel string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -161,13 +159,13 @@ index 592e058..0000000
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string) error {
+-func (d *Driver) Create(id string, parent string, mountLabel string) error {
- subvolumes := path.Join(d.home, "subvolumes")
- if err := os.MkdirAll(subvolumes, 0700); err != nil {
- return err
- }
- if parent == "" {
-- if err := subvolCreate(subvolumes, id); err != nil {
+- if err := subvolCreate(subvolumes, id, mountLabel); err != nil {
- return err
- }
- } else {
@@ -217,24 +215,19 @@ index 592e058..0000000
- _, err := os.Stat(dir)
- return err == nil
-}
-diff --git a/graphdriver/btrfs/dummy_unsupported.go b/graphdriver/btrfs/dummy_unsupported.go
-deleted file mode 100644
-index 6c44615..0000000
---- a/graphdriver/btrfs/dummy_unsupported.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
-diff --git a/runtime.go b/runtime.go
-index 84f11e8..41fdccd 100644
---- a/runtime.go
-+++ b/runtime.go
-@@ -11,7 +11,6 @@ import (
- "github.com/dotcloud/docker/execdriver/native"
- "github.com/dotcloud/docker/graphdriver"
- "github.com/dotcloud/docker/graphdriver/aufs"
-- _ "github.com/dotcloud/docker/graphdriver/btrfs"
- _ "github.com/dotcloud/docker/graphdriver/devmapper"
- _ "github.com/dotcloud/docker/graphdriver/vfs"
- _ "github.com/dotcloud/docker/networkdriver/lxc"
+diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go
+--- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400
+@@ -3,5 +3,4 @@
+ package runtime
+
+ import (
+- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
+ )
10 years, 1 month
[docker-io/f19] include manpages from contrib
by Lokesh Mandvekar
commit f5879f33521d1109171fd5dfb0b656f3d607b922
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 11:24:22 2014 -0400
include manpages from contrib
docker-io.spec | 12 +-
docker.1 | 1536 --------------------------------------------------------
2 files changed, 7 insertions(+), 1541 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ee36857..400fb64 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -28,7 +28,6 @@ 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.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -37,7 +36,7 @@ BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -113,7 +112,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 %{SOURCE1} %{buildroot}%{_mandir}/man1
+install -p -m 644 contrib/man/man1/docker*.1 %{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
@@ -174,7 +173,7 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%doc LICENSE-vim-syntax README-vim-syntax.md
-%{_mandir}/man1/docker.1.gz
+%{_mandir}/man1/docker*.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
@@ -198,10 +197,13 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
+- include manpages from contrib
+
* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
- Upstream version bump
-* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
+* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1
- BZ 1080799 - upstream version bump
* Thu Mar 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.9.0-3
10 years, 1 month
[docker-io/f19] Update to new upstream release 0.10.0
by Lokesh Mandvekar
commit c1341204a7476f643f5f5973e70b8a832bf162eb
Author: Bobby Powers <bobbypowers(a)gmail.com>
Date: Thu Apr 10 14:25:01 2014 -0700
Update to new upstream release 0.10.0
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 7 ++-
sources | 2 +-
upstream-patched-archive-tar.patch | 105 +++++++++++++++++++----------------
3 files changed, 64 insertions(+), 50 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cc76e69..ee36857 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -13,7 +13,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.9.1
+Version: 0.10.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -36,6 +36,8 @@ BuildRequires: glibc-static
BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
+BuildRequires: golang(github.com/godbus/dbus)
+BuildRequires: golang(github.com/coreos/go-systemd)
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -196,6 +198,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
+- Upstream version bump
+
* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
- BZ 1080799 - upstream version bump
diff --git a/sources b/sources
index e5765a9..8f84b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-194ee07653abb984bbbab0cf0f3b98f3 v0.9.1.tar.gz
+1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index b0fd2fd..225b1ab 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,7 +1,8 @@
-diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
---- docker-0.9.0/archive/archive.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive.go 2014-03-11 10:35:04.577207349 -0400
-@@ -8,7 +8,7 @@
+diff --git a/archive/archive.go b/archive/archive.go
+index 2fac18e..634e9c1 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -8,7 +8,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -10,10 +11,11 @@ diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_test.go
---- docker-0.9.0/archive/archive_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive_test.go 2014-03-11 10:34:03.705484166 -0400
-@@ -3,7 +3,7 @@
+diff --git a/archive/archive_test.go b/archive/archive_test.go
+index 4126601..ca5a80c 100644
+--- a/archive/archive_test.go
++++ b/archive/archive_test.go
+@@ -3,7 +3,7 @@ package archive
import (
"bytes"
"fmt"
@@ -22,10 +24,11 @@ diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_te
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
---- docker-0.9.0/archive/changes.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/changes.go 2014-03-11 10:34:40.196318221 -0400
-@@ -5,7 +5,7 @@
+diff --git a/archive/changes.go b/archive/changes.go
+index 723e4a7..51baa22 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -34,10 +37,11 @@ diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
"io"
"os"
"path/filepath"
-diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
---- docker-0.9.0/archive/diff.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/diff.go 2014-03-11 10:34:25.722384042 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/diff.go b/archive/diff.go
+index e20e4b1..a67b48a 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -2,7 +2,7 @@ package archive
import (
"fmt"
@@ -46,10 +50,11 @@ diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
---- docker-0.9.0/archive/wrap.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/wrap.go 2014-03-11 10:34:15.296431455 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 03ea508..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
import (
"bytes"
@@ -58,22 +63,37 @@ diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
"io/ioutil"
)
-diff -uNr docker-0.9.0/integration/api_test.go docker-0.9.0-1/integration/api_test.go
---- docker-0.9.0/integration/api_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/api_test.go 2014-03-11 10:35:17.048150637 -0400
-@@ -11,7 +11,7 @@
- "github.com/dotcloud/docker/engine"
- "github.com/dotcloud/docker/runconfig"
+diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
+index 1777391..5cfe4c2 100644
+--- a/graph/tags_unit_test.go
++++ b/graph/tags_unit_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/dotcloud/docker/runtime/graphdriver"
+ _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
+ "archive/tar"
"io"
- "io/ioutil"
- "net"
-diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/utils_test.go
---- docker-0.9.0/integration/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/utils_test.go 2014-03-11 10:35:31.429085241 -0400
-@@ -3,7 +3,7 @@
+ "os"
+ "path"
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 26441a2..a313382 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -21,7 +21,7 @@ import (
+ "github.com/dotcloud/docker/runconfig"
+ "github.com/dotcloud/docker/runtime"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ )
+
+ func TestGetEvents(t *testing.T) {
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 8ad6ccb..5b16f2a 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -3,7 +3,7 @@ package docker
import (
"bytes"
"fmt"
@@ -82,10 +102,11 @@ diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/util
"io"
"io/ioutil"
"net/http"
-diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
---- docker-0.9.0/utils/tarsum.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils/tarsum.go 2014-03-11 10:35:44.731024753 -0400
-@@ -5,7 +5,7 @@
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index 67e94aa..5132194 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -5,7 +5,7 @@ import (
"compress/gzip"
"crypto/sha256"
"encoding/hex"
@@ -94,15 +115,3 @@ diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
"hash"
"io"
"sort"
-diff -uNr docker-0.9.0/utils_test.go docker-0.9.0-1/utils_test.go
---- docker-0.9.0/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils_test.go 2014-03-11 10:35:55.151977365 -0400
-@@ -2,7 +2,7 @@
-
- import (
- "bytes"
-- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
-+ "archive/tar"
- "io"
- )
-
10 years, 1 month
[docker-io/el6] update commit value, regenerate epel btrfs removal patch
by Lokesh Mandvekar
commit 38d3d8121a239b8b9e4bf9a41f29f2fd66587a20
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 12:29:53 2014 -0400
update commit value, regenerate epel btrfs removal patch
docker-io.spec | 8 +++++-
ignore-btrfs-for-rhel.patch | 45 ++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 400fb64..cd576f9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 867b2a90c228f62cdcd44907ceef279a2d8f1ac5
+%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -197,6 +197,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+- regenerate btrfs removal patch
+- update commit value
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
- include manpages from contrib
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index ca3bc79..5a14235 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,8 +1,6 @@
-diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
-deleted file mode 100644
-index 592e058..0000000
---- a/graphdriver/btrfs/btrfs.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -17,7 +15,7 @@ index 592e058..0000000
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/graphdriver"
+- "github.com/dotcloud/docker/runtime/graphdriver"
- "os"
- "path"
- "syscall"
@@ -86,7 +84,7 @@ index 592e058..0000000
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string) error {
+-func subvolCreate(path, name string, mountLabel string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -161,13 +159,13 @@ index 592e058..0000000
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string) error {
+-func (d *Driver) Create(id string, parent string, mountLabel string) error {
- subvolumes := path.Join(d.home, "subvolumes")
- if err := os.MkdirAll(subvolumes, 0700); err != nil {
- return err
- }
- if parent == "" {
-- if err := subvolCreate(subvolumes, id); err != nil {
+- if err := subvolCreate(subvolumes, id, mountLabel); err != nil {
- return err
- }
- } else {
@@ -217,24 +215,19 @@ index 592e058..0000000
- _, err := os.Stat(dir)
- return err == nil
-}
-diff --git a/graphdriver/btrfs/dummy_unsupported.go b/graphdriver/btrfs/dummy_unsupported.go
-deleted file mode 100644
-index 6c44615..0000000
---- a/graphdriver/btrfs/dummy_unsupported.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
-diff --git a/runtime.go b/runtime.go
-index 84f11e8..41fdccd 100644
---- a/runtime.go
-+++ b/runtime.go
-@@ -11,7 +11,6 @@ import (
- "github.com/dotcloud/docker/execdriver/native"
- "github.com/dotcloud/docker/graphdriver"
- "github.com/dotcloud/docker/graphdriver/aufs"
-- _ "github.com/dotcloud/docker/graphdriver/btrfs"
- _ "github.com/dotcloud/docker/graphdriver/devmapper"
- _ "github.com/dotcloud/docker/graphdriver/vfs"
- _ "github.com/dotcloud/docker/networkdriver/lxc"
+diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go
+--- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400
+@@ -3,5 +3,4 @@
+ package runtime
+
+ import (
+- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
+ )
10 years, 1 month
[docker-io/el6] include manpages from contrib
by Lokesh Mandvekar
commit 931ab5984f6c2e9b9b487d02597eadc1b97ee2a3
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 11:24:22 2014 -0400
include manpages from contrib
docker-io.spec | 12 +-
docker.1 | 1536 --------------------------------------------------------
2 files changed, 7 insertions(+), 1541 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ee36857..400fb64 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -28,7 +28,6 @@ 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.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -37,7 +36,7 @@ BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -113,7 +112,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 %{SOURCE1} %{buildroot}%{_mandir}/man1
+install -p -m 644 contrib/man/man1/docker*.1 %{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
@@ -174,7 +173,7 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%doc LICENSE-vim-syntax README-vim-syntax.md
-%{_mandir}/man1/docker.1.gz
+%{_mandir}/man1/docker*.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
@@ -198,10 +197,13 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
+- include manpages from contrib
+
* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
- Upstream version bump
-* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
+* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1
- BZ 1080799 - upstream version bump
* Thu Mar 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.9.0-3
10 years, 1 month
[docker-io/el6] Update to new upstream release 0.10.0
by Lokesh Mandvekar
commit d7702bc3c1c78280c1886f921263685eaf863766
Author: Bobby Powers <bobbypowers(a)gmail.com>
Date: Thu Apr 10 14:25:01 2014 -0700
Update to new upstream release 0.10.0
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 7 ++-
sources | 2 +-
upstream-patched-archive-tar.patch | 105 +++++++++++++++++++----------------
3 files changed, 64 insertions(+), 50 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cc76e69..ee36857 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -13,7 +13,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.9.1
+Version: 0.10.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -36,6 +36,8 @@ BuildRequires: glibc-static
BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
+BuildRequires: golang(github.com/godbus/dbus)
+BuildRequires: golang(github.com/coreos/go-systemd)
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -196,6 +198,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
+- Upstream version bump
+
* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
- BZ 1080799 - upstream version bump
diff --git a/sources b/sources
index e5765a9..8f84b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-194ee07653abb984bbbab0cf0f3b98f3 v0.9.1.tar.gz
+1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index b0fd2fd..225b1ab 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,7 +1,8 @@
-diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
---- docker-0.9.0/archive/archive.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive.go 2014-03-11 10:35:04.577207349 -0400
-@@ -8,7 +8,7 @@
+diff --git a/archive/archive.go b/archive/archive.go
+index 2fac18e..634e9c1 100644
+--- a/archive/archive.go
++++ b/archive/archive.go
+@@ -8,7 +8,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -10,10 +11,11 @@ diff -uNr docker-0.9.0/archive/archive.go docker-0.9.0-1/archive/archive.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_test.go
---- docker-0.9.0/archive/archive_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/archive_test.go 2014-03-11 10:34:03.705484166 -0400
-@@ -3,7 +3,7 @@
+diff --git a/archive/archive_test.go b/archive/archive_test.go
+index 4126601..ca5a80c 100644
+--- a/archive/archive_test.go
++++ b/archive/archive_test.go
+@@ -3,7 +3,7 @@ package archive
import (
"bytes"
"fmt"
@@ -22,10 +24,11 @@ diff -uNr docker-0.9.0/archive/archive_test.go docker-0.9.0-1/archive/archive_te
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
---- docker-0.9.0/archive/changes.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/changes.go 2014-03-11 10:34:40.196318221 -0400
-@@ -5,7 +5,7 @@
+diff --git a/archive/changes.go b/archive/changes.go
+index 723e4a7..51baa22 100644
+--- a/archive/changes.go
++++ b/archive/changes.go
+@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
@@ -34,10 +37,11 @@ diff -uNr docker-0.9.0/archive/changes.go docker-0.9.0-1/archive/changes.go
"io"
"os"
"path/filepath"
-diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
---- docker-0.9.0/archive/diff.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/diff.go 2014-03-11 10:34:25.722384042 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/diff.go b/archive/diff.go
+index e20e4b1..a67b48a 100644
+--- a/archive/diff.go
++++ b/archive/diff.go
+@@ -2,7 +2,7 @@ package archive
import (
"fmt"
@@ -46,10 +50,11 @@ diff -uNr docker-0.9.0/archive/diff.go docker-0.9.0-1/archive/diff.go
"io"
"io/ioutil"
"os"
-diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
---- docker-0.9.0/archive/wrap.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/archive/wrap.go 2014-03-11 10:34:15.296431455 -0400
-@@ -2,7 +2,7 @@
+diff --git a/archive/wrap.go b/archive/wrap.go
+index 03ea508..0abe320 100644
+--- a/archive/wrap.go
++++ b/archive/wrap.go
+@@ -2,7 +2,7 @@ package archive
import (
"bytes"
@@ -58,22 +63,37 @@ diff -uNr docker-0.9.0/archive/wrap.go docker-0.9.0-1/archive/wrap.go
"io/ioutil"
)
-diff -uNr docker-0.9.0/integration/api_test.go docker-0.9.0-1/integration/api_test.go
---- docker-0.9.0/integration/api_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/api_test.go 2014-03-11 10:35:17.048150637 -0400
-@@ -11,7 +11,7 @@
- "github.com/dotcloud/docker/engine"
- "github.com/dotcloud/docker/runconfig"
+diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
+index 1777391..5cfe4c2 100644
+--- a/graph/tags_unit_test.go
++++ b/graph/tags_unit_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/dotcloud/docker/runtime/graphdriver"
+ _ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
+ "archive/tar"
"io"
- "io/ioutil"
- "net"
-diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/utils_test.go
---- docker-0.9.0/integration/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/integration/utils_test.go 2014-03-11 10:35:31.429085241 -0400
-@@ -3,7 +3,7 @@
+ "os"
+ "path"
+diff --git a/integration/api_test.go b/integration/api_test.go
+index 26441a2..a313382 100644
+--- a/integration/api_test.go
++++ b/integration/api_test.go
+@@ -21,7 +21,7 @@ import (
+ "github.com/dotcloud/docker/runconfig"
+ "github.com/dotcloud/docker/runtime"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ )
+
+ func TestGetEvents(t *testing.T) {
+diff --git a/integration/utils_test.go b/integration/utils_test.go
+index 8ad6ccb..5b16f2a 100644
+--- a/integration/utils_test.go
++++ b/integration/utils_test.go
+@@ -3,7 +3,7 @@ package docker
import (
"bytes"
"fmt"
@@ -82,10 +102,11 @@ diff -uNr docker-0.9.0/integration/utils_test.go docker-0.9.0-1/integration/util
"io"
"io/ioutil"
"net/http"
-diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
---- docker-0.9.0/utils/tarsum.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils/tarsum.go 2014-03-11 10:35:44.731024753 -0400
-@@ -5,7 +5,7 @@
+diff --git a/utils/tarsum.go b/utils/tarsum.go
+index 67e94aa..5132194 100644
+--- a/utils/tarsum.go
++++ b/utils/tarsum.go
+@@ -5,7 +5,7 @@ import (
"compress/gzip"
"crypto/sha256"
"encoding/hex"
@@ -94,15 +115,3 @@ diff -uNr docker-0.9.0/utils/tarsum.go docker-0.9.0-1/utils/tarsum.go
"hash"
"io"
"sort"
-diff -uNr docker-0.9.0/utils_test.go docker-0.9.0-1/utils_test.go
---- docker-0.9.0/utils_test.go 2014-03-10 12:57:10.000000000 -0400
-+++ docker-0.9.0-1/utils_test.go 2014-03-11 10:35:55.151977365 -0400
-@@ -2,7 +2,7 @@
-
- import (
- "bytes"
-- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
-+ "archive/tar"
- "io"
- )
-
10 years, 1 month
[docker-io/f20] update commit value, regenerate epel btrfs removal patch
by Lokesh Mandvekar
commit 65d44c5a38870f5f48de70ec3d2209069f7f0a9e
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 12:29:53 2014 -0400
update commit value, regenerate epel btrfs removal patch
docker-io.spec | 8 +++++-
ignore-btrfs-for-rhel.patch | 45 ++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 400fb64..cd576f9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 867b2a90c228f62cdcd44907ceef279a2d8f1ac5
+%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -197,6 +197,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+- regenerate btrfs removal patch
+- update commit value
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
- include manpages from contrib
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index ca3bc79..5a14235 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,8 +1,6 @@
-diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
-deleted file mode 100644
-index 592e058..0000000
---- a/graphdriver/btrfs/btrfs.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -17,7 +15,7 @@ index 592e058..0000000
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/graphdriver"
+- "github.com/dotcloud/docker/runtime/graphdriver"
- "os"
- "path"
- "syscall"
@@ -86,7 +84,7 @@ index 592e058..0000000
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string) error {
+-func subvolCreate(path, name string, mountLabel string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -161,13 +159,13 @@ index 592e058..0000000
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string) error {
+-func (d *Driver) Create(id string, parent string, mountLabel string) error {
- subvolumes := path.Join(d.home, "subvolumes")
- if err := os.MkdirAll(subvolumes, 0700); err != nil {
- return err
- }
- if parent == "" {
-- if err := subvolCreate(subvolumes, id); err != nil {
+- if err := subvolCreate(subvolumes, id, mountLabel); err != nil {
- return err
- }
- } else {
@@ -217,24 +215,19 @@ index 592e058..0000000
- _, err := os.Stat(dir)
- return err == nil
-}
-diff --git a/graphdriver/btrfs/dummy_unsupported.go b/graphdriver/btrfs/dummy_unsupported.go
-deleted file mode 100644
-index 6c44615..0000000
---- a/graphdriver/btrfs/dummy_unsupported.go
-+++ /dev/null
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
-diff --git a/runtime.go b/runtime.go
-index 84f11e8..41fdccd 100644
---- a/runtime.go
-+++ b/runtime.go
-@@ -11,7 +11,6 @@ import (
- "github.com/dotcloud/docker/execdriver/native"
- "github.com/dotcloud/docker/graphdriver"
- "github.com/dotcloud/docker/graphdriver/aufs"
-- _ "github.com/dotcloud/docker/graphdriver/btrfs"
- _ "github.com/dotcloud/docker/graphdriver/devmapper"
- _ "github.com/dotcloud/docker/graphdriver/vfs"
- _ "github.com/dotcloud/docker/networkdriver/lxc"
+diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go
+--- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400
+@@ -3,5 +3,4 @@
+ package runtime
+
+ import (
+- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
+ )
10 years, 1 month
[docker-io/f20] include manpages from contrib
by Lokesh Mandvekar
commit 95e1eefbcbda5391383a4999b6039717f4a81092
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Apr 14 11:24:22 2014 -0400
include manpages from contrib
docker-io.spec | 12 +-
docker.1 | 1536 --------------------------------------------------------
2 files changed, 7 insertions(+), 1541 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ee36857..400fb64 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -28,7 +28,6 @@ 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.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -37,7 +36,7 @@ BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd)
+BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
@@ -113,7 +112,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 %{SOURCE1} %{buildroot}%{_mandir}/man1
+install -p -m 644 contrib/man/man1/docker*.1 %{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
@@ -174,7 +173,7 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%doc LICENSE-vim-syntax README-vim-syntax.md
-%{_mandir}/man1/docker.1.gz
+%{_mandir}/man1/docker*.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
@@ -198,10 +197,13 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
+- include manpages from contrib
+
* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
- Upstream version bump
-* Thu Mar 27 2014 Lokesh Mandvekar - 0.9.1-1
+* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1
- BZ 1080799 - upstream version bump
* Thu Mar 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.9.0-3
10 years, 1 month