[docker-io/epel7] lxc no longer required
by Lokesh Mandvekar
commit 5efb0b9111df1bc85885f81ce43c2347cefa5c08
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 13:53:08 2014 -0400
lxc no longer required
docker-io.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1b1e167..a0c861e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -50,7 +50,6 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
%endif
-Requires: lxc
Requires: tar
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
@@ -192,6 +191,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-2
+- lxc removed (optional)
+ http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-an...
+
* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
- BZ 1074880 - upstream version bump to v0.9.0
10 years, 1 month
[docker-io/f20] lxc no longer required
by Lokesh Mandvekar
commit 8299d691d630622bf6fc81f7214d3954301d2e11
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 13:53:08 2014 -0400
lxc no longer required
docker-io.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1b1e167..a0c861e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -50,7 +50,6 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
%endif
-Requires: lxc
Requires: tar
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
@@ -192,6 +191,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-2
+- lxc removed (optional)
+ http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-an...
+
* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
- BZ 1074880 - upstream version bump to v0.9.0
10 years, 1 month
[docker-io] lxc no longer required
by Lokesh Mandvekar
commit 38c918d2e59c17710ae9db594da558401b9130aa
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 13:53:08 2014 -0400
lxc no longer required
docker-io.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1b1e167..a0c861e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -50,7 +50,6 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
%endif
-Requires: lxc
Requires: tar
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
@@ -192,6 +191,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-2
+- lxc removed (optional)
+ http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-an...
+
* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
- BZ 1074880 - upstream version bump to v0.9.0
10 years, 1 month
[docker-io/f19] regenerate patch for btrfs removal
by Lokesh Mandvekar
commit 9246bb95dadcf7147daff750a0decc541a5a9b0c
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:30:04 2014 -0400
regenerate patch for btrfs removal
ignore-btrfs-for-rhel.patch | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5e8cfd5..ca3bc79 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,16 +1,3 @@
-From 4502ce66c679c19d1e4c78eda417063ec87b0656 Mon Sep 17 00:00:00 2001
-From: Lokesh Mandvekar <lsm5(a)redhat.com>
-Date: Wed, 5 Feb 2014 14:29:41 -0500
-Subject: [PATCH] ignore btrfs for rhel6
-
----
- graphdriver/btrfs/btrfs.go | 213 ---------------------------------
- graphdriver/btrfs/dummy_unsupported.go | 3 -
- runtime.go | 1 -
- 3 files changed, 217 deletions(-)
- delete mode 100644 graphdriver/btrfs/btrfs.go
- delete mode 100644 graphdriver/btrfs/dummy_unsupported.go
-
diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
deleted file mode 100644
index 592e058..0000000
@@ -240,17 +227,14 @@ index 6c44615..0000000
-
-package btrfs
diff --git a/runtime.go b/runtime.go
-index 7e4ae79..b8f315d 100644
+index 84f11e8..41fdccd 100644
--- a/runtime.go
+++ b/runtime.go
-@@ -10,7 +10,6 @@ import (
- "github.com/dotcloud/docker/execdriver/lxc"
+@@ -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"
---
-1.8.5.3
-
10 years, 1 month
[docker-io/f19] BZ 1074880 - bump to v0.9.0.
by Lokesh Mandvekar
commit 2d87d18f8c87536930f3a28775420974a6a8aca8
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:11:21 2014 -0400
BZ 1074880 - bump to v0.9.0.
docker-io.spec | 11 ++-
remove-vendored-tar.patch | 109 ------------------------------------
sources | 2 +-
upstream-patched-archive-tar.patch | 108 +++++++++++++++++++++++++++++++++++
4 files changed, 116 insertions(+), 114 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8b7fbb9..1b1e167 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,17 +9,17 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit a1598d1e1c157388f3b07415729de28f4d205e49
+%global commit 2b3fdf2344fee3affc44c93a034ce894af4d6193
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.1
+Version: 0.9.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
-Patch1: remove-vendored-tar.patch
+Patch1: upstream-patched-archive-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -81,7 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
-%patch1 -p1 -b remove-vendored-tar
+%patch1 -p1 -b upstream-patched-archive-tar
%build
mkdir _build
@@ -192,6 +192,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
+- BZ 1074880 - upstream version bump to v0.9.0
+
* 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
diff --git a/sources b/sources
index b77c489..ef99d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
+5969bb91ec4f17aa381831046fb15531 v0.9.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
new file mode 100644
index 0000000..b0fd2fd
--- /dev/null
+++ b/upstream-patched-archive-tar.patch
@@ -0,0 +1,108 @@
+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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "bytes"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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] regenerate patch for btrfs removal
by Lokesh Mandvekar
commit 15bc79a4ea21ebe2ccb3a628773abc38a3798f15
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:30:04 2014 -0400
regenerate patch for btrfs removal
ignore-btrfs-for-rhel.patch | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5e8cfd5..ca3bc79 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,16 +1,3 @@
-From 4502ce66c679c19d1e4c78eda417063ec87b0656 Mon Sep 17 00:00:00 2001
-From: Lokesh Mandvekar <lsm5(a)redhat.com>
-Date: Wed, 5 Feb 2014 14:29:41 -0500
-Subject: [PATCH] ignore btrfs for rhel6
-
----
- graphdriver/btrfs/btrfs.go | 213 ---------------------------------
- graphdriver/btrfs/dummy_unsupported.go | 3 -
- runtime.go | 1 -
- 3 files changed, 217 deletions(-)
- delete mode 100644 graphdriver/btrfs/btrfs.go
- delete mode 100644 graphdriver/btrfs/dummy_unsupported.go
-
diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
deleted file mode 100644
index 592e058..0000000
@@ -240,17 +227,14 @@ index 6c44615..0000000
-
-package btrfs
diff --git a/runtime.go b/runtime.go
-index 7e4ae79..b8f315d 100644
+index 84f11e8..41fdccd 100644
--- a/runtime.go
+++ b/runtime.go
-@@ -10,7 +10,6 @@ import (
- "github.com/dotcloud/docker/execdriver/lxc"
+@@ -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"
---
-1.8.5.3
-
10 years, 1 month
[docker-io/el6] BZ 1074880 - bump to v0.9.0.
by Lokesh Mandvekar
commit 07ce9f99b7021b6bfb623bcc238b0a95ce36a97a
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:11:21 2014 -0400
BZ 1074880 - bump to v0.9.0.
docker-io.spec | 11 ++-
remove-vendored-tar.patch | 109 ------------------------------------
sources | 2 +-
upstream-patched-archive-tar.patch | 108 +++++++++++++++++++++++++++++++++++
4 files changed, 116 insertions(+), 114 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8b7fbb9..1b1e167 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,17 +9,17 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit a1598d1e1c157388f3b07415729de28f4d205e49
+%global commit 2b3fdf2344fee3affc44c93a034ce894af4d6193
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.1
+Version: 0.9.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
-Patch1: remove-vendored-tar.patch
+Patch1: upstream-patched-archive-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -81,7 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
-%patch1 -p1 -b remove-vendored-tar
+%patch1 -p1 -b upstream-patched-archive-tar
%build
mkdir _build
@@ -192,6 +192,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
+- BZ 1074880 - upstream version bump to v0.9.0
+
* 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
diff --git a/sources b/sources
index b77c489..ef99d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
+5969bb91ec4f17aa381831046fb15531 v0.9.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
new file mode 100644
index 0000000..b0fd2fd
--- /dev/null
+++ b/upstream-patched-archive-tar.patch
@@ -0,0 +1,108 @@
+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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "bytes"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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/epel7] regenerate patch for btrfs removal
by Lokesh Mandvekar
commit 79d6ba41d43979fa41760956453a4c9e936f90bb
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:30:04 2014 -0400
regenerate patch for btrfs removal
ignore-btrfs-for-rhel.patch | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5e8cfd5..ca3bc79 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,16 +1,3 @@
-From 4502ce66c679c19d1e4c78eda417063ec87b0656 Mon Sep 17 00:00:00 2001
-From: Lokesh Mandvekar <lsm5(a)redhat.com>
-Date: Wed, 5 Feb 2014 14:29:41 -0500
-Subject: [PATCH] ignore btrfs for rhel6
-
----
- graphdriver/btrfs/btrfs.go | 213 ---------------------------------
- graphdriver/btrfs/dummy_unsupported.go | 3 -
- runtime.go | 1 -
- 3 files changed, 217 deletions(-)
- delete mode 100644 graphdriver/btrfs/btrfs.go
- delete mode 100644 graphdriver/btrfs/dummy_unsupported.go
-
diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
deleted file mode 100644
index 592e058..0000000
@@ -240,17 +227,14 @@ index 6c44615..0000000
-
-package btrfs
diff --git a/runtime.go b/runtime.go
-index 7e4ae79..b8f315d 100644
+index 84f11e8..41fdccd 100644
--- a/runtime.go
+++ b/runtime.go
-@@ -10,7 +10,6 @@ import (
- "github.com/dotcloud/docker/execdriver/lxc"
+@@ -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"
---
-1.8.5.3
-
10 years, 1 month
[docker-io/epel7] BZ 1074880 - bump to v0.9.0.
by Lokesh Mandvekar
commit 6d090e480bf43e15372369925e5777ce734f7aa3
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:11:21 2014 -0400
BZ 1074880 - bump to v0.9.0.
docker-io.spec | 11 ++-
remove-vendored-tar.patch | 109 ------------------------------------
sources | 2 +-
upstream-patched-archive-tar.patch | 108 +++++++++++++++++++++++++++++++++++
4 files changed, 116 insertions(+), 114 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8b7fbb9..1b1e167 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,17 +9,17 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit a1598d1e1c157388f3b07415729de28f4d205e49
+%global commit 2b3fdf2344fee3affc44c93a034ce894af4d6193
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.8.1
+Version: 0.9.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
-Patch1: remove-vendored-tar.patch
+Patch1: upstream-patched-archive-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -81,7 +81,7 @@ rm -rf vendor
%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
-%patch1 -p1 -b remove-vendored-tar
+%patch1 -p1 -b upstream-patched-archive-tar
%build
mkdir _build
@@ -192,6 +192,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
+- BZ 1074880 - upstream version bump to v0.9.0
+
* 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
diff --git a/sources b/sources
index b77c489..ef99d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
+5969bb91ec4f17aa381831046fb15531 v0.9.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
new file mode 100644
index 0000000..b0fd2fd
--- /dev/null
+++ b/upstream-patched-archive-tar.patch
@@ -0,0 +1,108 @@
+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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+
+ import (
+ "bytes"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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"
+ "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 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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 @@
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "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] regenerate patch for btrfs removal
by Lokesh Mandvekar
commit df3ca75f12bb25e76165a72b6dc3b9df731772e5
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Tue Mar 11 11:30:04 2014 -0400
regenerate patch for btrfs removal
ignore-btrfs-for-rhel.patch | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5e8cfd5..ca3bc79 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,16 +1,3 @@
-From 4502ce66c679c19d1e4c78eda417063ec87b0656 Mon Sep 17 00:00:00 2001
-From: Lokesh Mandvekar <lsm5(a)redhat.com>
-Date: Wed, 5 Feb 2014 14:29:41 -0500
-Subject: [PATCH] ignore btrfs for rhel6
-
----
- graphdriver/btrfs/btrfs.go | 213 ---------------------------------
- graphdriver/btrfs/dummy_unsupported.go | 3 -
- runtime.go | 1 -
- 3 files changed, 217 deletions(-)
- delete mode 100644 graphdriver/btrfs/btrfs.go
- delete mode 100644 graphdriver/btrfs/dummy_unsupported.go
-
diff --git a/graphdriver/btrfs/btrfs.go b/graphdriver/btrfs/btrfs.go
deleted file mode 100644
index 592e058..0000000
@@ -240,17 +227,14 @@ index 6c44615..0000000
-
-package btrfs
diff --git a/runtime.go b/runtime.go
-index 7e4ae79..b8f315d 100644
+index 84f11e8..41fdccd 100644
--- a/runtime.go
+++ b/runtime.go
-@@ -10,7 +10,6 @@ import (
- "github.com/dotcloud/docker/execdriver/lxc"
+@@ -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"
---
-1.8.5.3
-
10 years, 1 month