[golang/el6] (5 commits) ...Merge branch 'master' into el6
by Vincent Batts
Summary of changes:
573d0ba... not sure why go1.2.2 shuffled some of the arch-depenedent f (*)
28979ba... more rearranging (*)
e46d680... nach ein mahl (*)
789ff2e... nach ein mahl (*)
81323f3... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
10 years
[docker-io/el6: 4/4] Merge pull request #9 from steeef/el6-0.11.1
by Lokesh Mandvekar
commit d130759865300e685796039ca14bb610ce34ccda
Merge: a24eac5 f59c33b
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue May 13 17:29:10 2014 -0400
Merge pull request #9 from steeef/el6-0.11.1
El6 0.11.1
docker-io.spec | 28 ++++++++++++++++++++++---
docker.sysconfig | 7 ++++++
ignore-btrfs-for-rhel.patch | 47 +++++++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 58 insertions(+), 26 deletions(-)
---
10 years
[docker-io/el6: 3/4] update btrfs patch path, remove lxc patch
by Lokesh Mandvekar
commit f59c33b0d71d98971aadb19aa7e0770515944dd0
Author: Stephen Price <stephen(a)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=a15f344a9efa35ef168c8feaa92a1...
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(a)gmail.com> - 0.11.1-3
+- add selinux to sysconfig
+
+* Tue May 13 2014 Stephen Price <steeef(a)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(a)gmail.com> - 0.11.1-1
+- Upstream version bump
+- Update changed paths
+- Remove lxc patch
+
* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)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(a)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
10 years
[docker-io/el6: 2/4] correct release tag in changelog
by Lokesh Mandvekar
commit a24eac5506a027d41dab935b09a94580874cb790
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 15:50:51 2014 -0400
correct release tag in changelog
docker-io.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7e2d61d..a793d8b 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -159,7 +159,7 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
-* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-3
- remove fedora/rhel conditionals (not built)
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
10 years
[docker-io/el6: 1/4] conditionals removed
by Lokesh Mandvekar
commit b15afa386264fdb30d293e5e874e74a7d1d77684
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 15:48:43 2014 -0400
conditionals removed
docker-io.spec | 45 +++++----------------------------------------
1 files changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index cd576f9..7e2d61d 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%bcond_without systemd
-%endif
-
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
@@ -14,7 +10,7 @@
Name: docker-io
Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -41,31 +37,20 @@ BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: device-mapper-devel
-# btrfs not available for rhel yet
-%if 0%{?fedora}
-BuildRequires: btrfs-progs-devel
-%endif
-%if %{with systemd}
-BuildRequires: pkgconfig(systemd)
-Requires: systemd-units
-%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
-%endif
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
# this won't be needed for rhel7+
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
Requires: bridge-utils
Requires: lxc
# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
# No longer needed in Fedora because of libcontainer
Requires: libcgroup
-%endif
Provides: lxc-docker = %{version}
@@ -82,10 +67,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel}
%patch0 -p1 -b ignore-btrfs-for-rhel
%patch90 -p1 -b docker-0.9-el6-lxc
-%endif
%patch1 -p1 -b upstream-patched-archive-tar
%build
@@ -129,45 +112,28 @@ install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/rules.d
# install storage dir
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-# install systemd/init scripts
-%if %{with systemd}
-install -d %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
-%else
+# install init scripts
install -d %{buildroot}%{_sysconfdir}/sysconfig/
install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
-%endif
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
%post
-%if %{with systemd}
-%systemd_post docker
-%else
# install but don't activate
/sbin/chkconfig --add docker
-%endif
%preun
-%if %{with systemd}
-%systemd_preun docker
-%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
-%endif
%postun
-%if %{with systemd}
-%systemd_postun_with_restart docker
-%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
fi
-%endif
%files
%defattr(-,root,root,-)
@@ -177,12 +143,8 @@ fi
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
-%if %{with systemd}
-%{_unitdir}/docker.service
-%else
%config(noreplace) %{_sysconfdir}/sysconfig/docker
%{_initddir}/docker
-%endif
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -197,6 +159,9 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+- remove fedora/rhel conditionals (not built)
+
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
- regenerate btrfs removal patch
- update commit value
10 years
[Bug 1060502] Review Request: golang-github-mitchellh-cli - A library for implementing powerful command-line interfaces in Go
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1060502
--- Comment #4 from Lubomir Rintel <lkundrak(a)v3.sk> ---
The above review makes sense. Just some random extra things I've verified
manually:
* Package is named correctly
* The version tag makes sense
* License tag is correct
* License is fine
* License text included
* rpmlint is happy
* SPEC file is clean and legible
Nothing severe really stands out; basically a couple of style issues:
0.) The description is a bit weird: Please do not repeat the summary and omit
the hyperlinks.
%description
This (cli) is the library for implementing powerful command-line
interfaces in Go. It's used by Self and Packer.
%description devel
This package contains the library for implementing powerful command-line
interfaces in Go. It's intended for building other packages which use these
functions.
1.) Please move BuildRequires ourside %package section.
2.) The package should always be noarch.
It only ships architecture-independent files. See [1]
[1]
https://fedoraproject.org/wiki/Packaging:Guidelines#Noarch_with_unported_...
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildArch: noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
+BuildArch: noarch
+%if 0%{?fedora} < 19 && 0%{?rhel} < 7
+ExclusiveArch: %{ix86} x86_64 %{arm} noarch
+%endif
3.) No need for the %attr macro; install files with correct mode in %install.
You won't need to list the whole hierarchy too.
-%dir %attr(755,root,root) %{gopath}
-%dir %attr(755,root,root) %{gopath}/src
-%dir %attr(755,root,root) %{gopath}/src/github.com
-%dir %attr(755,root,root) %{gopath}/src/github.com/mitchellh
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
-%attr(644,root,root) %{gopath}/src/%{import_path}/*.go
+%{gopath}
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years
[golang] nach ein mahl
by Vincent Batts
commit 789ff2e39dc8dbfe46cb37fe192fdd7e275ba558
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue May 13 13:04:10 2014 -0400
nach ein mahl
golang.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index dde9e73..f4e5701 100644
--- a/golang.spec
+++ b/golang.spec
@@ -676,6 +676,8 @@ fi
%ifarch %{arm}
%exclude %{goroot}/src/cmd/5l/enam.c
%exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go
+%exclude %{goroot}/src/cmd/6l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c
10 years