[docker-io/el6: 3/4] update btrfs patch path, remove lxc patch
Lokesh Mandvekar
lsm5 at fedoraproject.org
Wed May 14 13:00:27 UTC 2014
commit f59c33b0d71d98971aadb19aa7e0770515944dd0
Author: Stephen Price <stephen at stp5.net>
Date: Mon May 12 09:24:26 2014 -0700
update btrfs patch path, remove lxc patch
update for 0.11.1
update md5sum
update changelog
update patch
add lxc patch, man script
add patch
add selinux, comments
add pandoc requirement
add selinux to sysconfig
add selinux to sysconfig
add selinux to sysconfig
docker-io.spec | 28 ++++++++++++++++++++++---
docker.sysconfig | 7 ++++++
ignore-btrfs-for-rhel.patch | 47 +++++++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 58 insertions(+), 26 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a793d8b..74cacb6 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -5,27 +5,29 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit dc9c28f51d669d6b09e81c2381f800f1a33bb659
+%global commit fb99f992c081a1d433c97c99ffb46d12693eeb76
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.10.0
+Version: 0.11.1
Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
Patch1: upstream-patched-archive-tar.patch
-
Patch90: docker-0.9-el6-lxc.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
+Source1: docker.sysconfig
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
BuildRequires: glibc-static
+BuildRequires: pandoc
# ensure build uses golang 1.2-7 and above
# http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a15a1cdc93db5
BuildRequires: golang >= 1.2-7
@@ -69,7 +71,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
rm -rf vendor
%patch0 -p1 -b ignore-btrfs-for-rhel
%patch90 -p1 -b docker-0.9-el6-lxc
-%patch1 -p1 -b upstream-patched-archive-tar
+%patch1 -p1 -F 2 -b upstream-patched-archive-tar
+cp -p %SOURCE1 contrib/init/sysvinit-redhat/docker.sysconfig
%build
mkdir _build
@@ -80,12 +83,16 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
cp contrib/syntax/vim/README.md README-vim-syntax.md
+#make man pages
+contrib/man/md/md2man-all.sh
+
%install
# install binary
install -d %{buildroot}%{_bindir}
@@ -159,6 +166,19 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue May 13 2014 Stephen Price <steeef at gmail.com> - 0.11.1-3
+- add selinux to sysconfig
+
+* Tue May 13 2014 Stephen Price <steeef at gmail.com> - 0.11.1-2
+- add lxc patch back
+- use md2man-all.sh to generate man pages
+- add selinux
+
+* Mon May 12 2014 Stephen Price <steeef at gmail.com> - 0.11.1-1
+- Upstream version bump
+- Update changed paths
+- Remove lxc patch
+
* Fri May 09 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.10.0-3
- remove fedora/rhel conditionals (not built)
diff --git a/docker.sysconfig b/docker.sysconfig
new file mode 100644
index 0000000..bf5a87c
--- /dev/null
+++ b/docker.sysconfig
@@ -0,0 +1,7 @@
+# /etc/sysconfig/docker
+#
+# Other arguments to pass to the docker daemon process
+# These will be parsed by the sysv initscript and appended
+# to the arguments list passed to docker -d
+
+other_args="--selinux-enabled"
diff --git a/ignore-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
index 5a14235..ca709ef 100644
--- a/ignore-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,6 +1,15 @@
-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
+diff -rupN docker-0.11.1/daemon/daemon_btrfs.go docker-0.11.1-patched/daemon/daemon_btrfs.go
+--- docker-0.11.1/daemon/daemon_btrfs.go 2014-05-07 17:29:56.000000000 -0700
++++ docker-0.11.1-patched/daemon/daemon_btrfs.go 2014-05-12 09:23:41.350780691 -0700
+@@ -3,5 +3,4 @@
+ package daemon
+
+ import (
+- _ "github.com/dotcloud/docker/daemon/graphdriver/btrfs"
+ )
+diff -rupN docker-0.11.1/daemon/graphdriver/btrfs/btrfs.go docker-0.11.1-patched/daemon/graphdriver/btrfs/btrfs.go
+--- docker-0.11.1/daemon/graphdriver/btrfs/btrfs.go 2014-05-07 17:29:56.000000000 -0700
++++ docker-0.11.1-patched/daemon/graphdriver/btrfs/btrfs.go 1969-12-31 16:00:00.000000000 -0800
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -15,7 +24,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/runtime/graphdriver"
+- "github.com/dotcloud/docker/daemon/graphdriver"
- "os"
- "path"
- "syscall"
@@ -84,7 +93,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string, mountLabel string) error {
+-func subvolCreate(path, name string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -159,17 +168,17 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string, mountLabel string) error {
+-func (d *Driver) Create(id string, parent 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, mountLabel); err != nil {
+- if err := subvolCreate(subvolumes, id); err != nil {
- return err
- }
- } else {
-- parentDir, err := d.Get(parent)
+- parentDir, err := d.Get(parent, "")
- if err != nil {
- return err
- }
@@ -191,7 +200,7 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- return os.RemoveAll(dir)
-}
-
--func (d *Driver) Get(id string) (string, error) {
+-func (d *Driver) Get(id, mountLabel string) (string, error) {
- dir := d.subvolumesDirId(id)
- st, err := os.Stat(dir)
- if err != nil {
@@ -215,19 +224,15 @@ diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runti
- _, err := os.Stat(dir)
- return err == nil
-}
-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
+diff -rupN docker-0.11.1/daemon/graphdriver/btrfs/dummy_unsupported.go docker-0.11.1-patched/daemon/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.11.1/daemon/graphdriver/btrfs/dummy_unsupported.go 2014-05-07 17:29:56.000000000 -0700
++++ docker-0.11.1-patched/daemon/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
-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"
- )
+diff -rupN docker-0.11.1/daemon/graphdriver/btrfs/MAINTAINERS docker-0.11.1-patched/daemon/graphdriver/btrfs/MAINTAINERS
+--- docker-0.11.1/daemon/graphdriver/btrfs/MAINTAINERS 2014-05-07 17:29:56.000000000 -0700
++++ docker-0.11.1-patched/daemon/graphdriver/btrfs/MAINTAINERS 1969-12-31 16:00:00.000000000 -0800
+@@ -1 +0,0 @@
+-Alexander Larsson <alexl at redhat.com> (@alexlarsson)
diff --git a/sources b/sources
index 8f84b86..6c0b0dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz
+6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz
More information about the scm-commits
mailing list