# modifying the dockerinit binary breaks the SHA1 sum check by docker

%global __os_install_post %{_rpmconfigdir}/brp-compress

#debuginfo not supported with Go

%global debug_package   %{nil}

%global provider_tld    com

%global provider        github

%global project         docker

%global repo            docker

%global common_path     %{provider}.%{provider_tld}/%{project}

%global import_path                 %{common_path}/%{repo}

%global import_path_libcontainer    %{common_path}/libcontainer

%global commit      39fa2faad2f3d6fa5133de4eb740677202f53ef4

%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name:       docker

Version:    1.3.2

Release:    4%{?dist}

Summary:    Automates deployment of containerized applications

License:    ASL 2.0

URL:        http://www.docker.com

# only x86_64 for now: https://github.com/docker/docker/issues/136

ExclusiveArch:  x86_64

Source0:    https://%{import_path}/archive/v%{version}.tar.gz

Patch1:     go-md2man.patch

Patch2:     0007-validate-image-ID-properly-before-load.patch

Patch3:     secrets.patch

Source1:    docker.service

Source2:    codegansta.tgz

Source3:    docker.sysconfig

Source5:    docker-storage.sysconfig

BuildRequires:  glibc-static

BuildRequires:  golang >= 1.3.1

BuildRequires:  device-mapper-devel

BuildRequires:  btrfs-progs-devel

BuildRequires:  sqlite-devel

BuildRequires:  pkgconfig(systemd)

# appropriate systemd version as per rhbz#1171054

Requires:   systemd-units >= 208-11.el7_0.5

# need xz to work with ubuntu images

Requires:   xz

Requires:   device-mapper-libs >= 1.02.90-1

Provides:   lxc-docker = %{version}

Provides:   docker = %{version}

Provides:	docker-io = %{version}

Provides:   nsinit

%description

Docker is an open-source engine that automates the deployment of any

application as a lightweight, portable, self-sufficient container that will

run virtually anywhere.

Docker containers can encapsulate any payload, and will run consistently on

and between virtually any server. The same container that a developer builds

and tests on a laptop will run at scale, in production*, on VMs, bare-metal

servers, OpenStack clusters, public instances, or combinations of the above.

%package devel

BuildRequires:   golang >= 1.3.1

Requires:   golang >= 1.3.1

Summary:    A golang registry for global request variables (source libraries)

Provides:   docker-pkg-devel docker-io-devel docker-io-pkg-devel

Provides:   golang(%{import_path}) = %{version}-%{release}

Provides:   golang(%{import_path}/api) = %{version}-%{release}

Provides:   golang(%{import_path}/api/client) = %{version}-%{release}

Provides:   golang(%{import_path}/api/server) = %{version}-%{release}

Provides:   golang(%{import_path}/builder) = %{version}-%{release}

Provides:   golang(%{import_path}/builder/parser) = %{version}-%{release}

Provides:   golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}

Provides:   golang(%{import_path}/builtins) = %{version}-%{release}

Provides:   golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}

Provides:   golang(%{import_path}/contrib/host-integration) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/execdriver) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/networkdriver) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release}

Provides:   golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release}

Provides:   golang(%{import_path}/dockerversion) = %{version}-%{release}

Provides:   golang(%{import_path}/engine) = %{version}-%{release}

Provides:   golang(%{import_path}/events) = %{version}-%{release}

Provides:   golang(%{import_path}/graph) = %{version}-%{release}

Provides:   golang(%{import_path}/image) = %{version}-%{release}

Provides:   golang(%{import_path}/integration) = %{version}-%{release}

Provides:   golang(%{import_path}/integration-cli) = %{version}-%{release}

Provides:   golang(%{import_path}/links) = %{version}-%{release}

Provides:   golang(%{import_path}/nat) = %{version}-%{release}

Provides:   golang(%{import_path}/opts) = %{version}-%{release}

Provides:   golang(%{import_path}/registry) = %{version}-%{release}

Provides:   golang(%{import_path}/runconfig) = %{version}-%{release}

Provides:   golang(%{import_path}/trust) = %{version}-%{release}

Provides:   golang(%{import_path}/utils) = %{version}-%{release}

Provides:   golang(%{import_path}/volumes) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/archive) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/fileutils) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/graphdb) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/httputils) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/ioutils) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/iptables) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/jsonlog) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/log) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/mflag) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/mflag/example) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/mount) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/parsers) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/pools) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/promise) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/proxy) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/reexec) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/signal) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/stdcopy) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/symlink) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/sysinfo) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/system) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/systemd) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/tailfile) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/tarsum) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/term) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/testutils) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/timeutils) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/truncindex) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/units) = %{version}-%{release}

Provides:   golang(%{import_path}/pkg/version) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/apparmor) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/cgroups) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/cgroups/fs) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/cgroups/systemd) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/console) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/devices) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/label) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/mount) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/mount/nodes) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/namespaces) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/namespaces/nsenter) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/netlink) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/network) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/nsinit) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/security/capabilities) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/security/restrict) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/selinux) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/syncpipe) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/system) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/user) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/utils) = %{version}-%{release}

Provides:   golang(%{import_path_libcontainer}/xattr) = %{version}-%{release}

Obsoletes:	golang-github-docker-libcontainer-devel

%description devel

This is the source libraries for docker.

%prep

%setup -qn docker-%{version}

%patch1 -p1

%patch2 -p1

%patch3 -p1

rm daemon/*.orig

tar zxf %{SOURCE2}

%build

mkdir _build

pushd _build

  mkdir -p src/github.com/docker

  ln -s $(dirs +1 -l) src/github.com/docker/docker

popd

export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"

export DOCKER_BUILDTAGS='selinux'

export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}

# build docker binary

hack/make.sh dynbinary

cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax

cp contrib/syntax/vim/README.md README-vim-syntax.md

pushd $(pwd)/_build/src

# build nsinit

go build github.com/docker/libcontainer/nsinit

# build go-md2man for building manpages

go build github.com/cpuguy83/go-md2man

popd

cp _build/src/go-md2man docs/man/.

sed -i 's/go-md2man/.\/go-md2man/' docs/man/md2man-all.sh

# build manpages

docs/man/md2man-all.sh

%install

# install binary

install -d %{buildroot}%{_bindir}

install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker

# install dockerinit

install -d %{buildroot}%{_libexecdir}/docker

install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit

# install manpages

install -d %{buildroot}%{_mandir}/man1

install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1

install -d %{buildroot}%{_mandir}/man5

install -p -m 644 docs/man/man5/* %{buildroot}%{_mandir}/man5

# install bash completion

install -d %{buildroot}%{_datadir}/bash-completion/completions/

install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions/

# install zsh completion

install -d %{buildroot}%{_datadir}/zsh/site-functions

install -p -m 644 contrib/completion/zsh/_docker %{buildroot}%{_datadir}/zsh/site-functions

# install vim syntax highlighting

install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}

install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc

install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect

install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax

# install udev rules

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

install -d %{buildroot}%{_unitdir}

install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}

install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir}

# for additional args

install -d %{buildroot}%{_sysconfdir}/sysconfig/

install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker

install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage

# install secrets dir

install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets

# rhbz#1110876 - update symlinks for subscription management

ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement

ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm

ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo

mkdir -p %{buildroot}/etc/docker/certs.d/redhat.com

ln -s /etc/rhsm/ca/redhat-uep.pem %{buildroot}/etc/docker/certs.d/redhat.com/redhat-ca.crt

# Install nsinit

install -d -p %{buildroot}%{gopath}/src/%{import_path_libcontainer}/nsinit

cp -pav vendor/src/%{import_path_libcontainer}/nsinit/*.go %{buildroot}%{gopath}/src/%{import_path_libcontainer}/nsinit

install -d %{buildroot}%{_bindir}

install -p -m 755 ./_build/src/nsinit %{buildroot}%{_bindir}/nsinit

# Install libcontainer

for dir in . apparmor cgroups cgroups/fs cgroups/systemd \

	console devices label mount mount/nodes namespaces \

	netlink network nsinit security/capabilities \

	security/restrict selinux syncpipe system user utils xattr

do

    install -d -p %{buildroot}%{gopath}/src/%{import_path_libcontainer}/$dir

    cp -pav vendor/src/%{import_path_libcontainer}/$dir/*.go %{buildroot}%{gopath}/src/%{import_path_libcontainer}/$dir

done

# sources

install -d -p %{buildroot}/%{gopath}/src/%{import_path}

for dir in api builder builtins contrib/docker-device-tool \

        contrib/host-integration daemon docker dockerinit \

        dockerversion engine events graph \

        image links nat opts pkg registry runconfig \

        trust utils volumes

do

       echo $dir

        cp -pav $dir %{buildroot}/%{gopath}/src/%{import_path}/

done

find %{buildroot}/%{gopath}/src/%{import_path}/ -name \*.registry -delete

%pre

getent group docker > /dev/null || %{_sbindir}/groupadd -r docker

exit 0

%post

%systemd_post docker.service

%preun

%systemd_preun docker.service

%postun

%systemd_postun_with_restart docker.service

%files

%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE

%doc LICENSE* README*.md

%{_mandir}/man1/*

%{_mandir}/man5/*

%{_bindir}/docker

%dir %{_datadir}/rhel

%dir %{_datadir}/rhel/secrets

%{_datadir}/rhel/secrets/etc-pki-entitlement

%{_datadir}/rhel/secrets/rhel7.repo

%{_datadir}/rhel/secrets/rhsm

%dir %{_libexecdir}/docker

%{_libexecdir}/docker/dockerinit

%{_unitdir}/docker.service

%{_unitdir}/docker.socket

%config(noreplace) %{_sysconfdir}/sysconfig/docker

%config(noreplace) %{_sysconfdir}/sysconfig/docker-storage

%{_sysconfdir}/docker/certs.d

%{_datadir}/bash-completion/completions/docker

%{_datadir}/zsh/site-functions/_docker

%dir %{_sharedstatedir}/docker

%dir %{_sysconfdir}/udev/rules.d

%{_sysconfdir}/udev/rules.d/80-docker.rules

%dir %{_datadir}/vim/vimfiles/doc

%{_datadir}/vim/vimfiles/doc/dockerfile.txt

%dir %{_datadir}/vim/vimfiles/ftdetect

%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim

%dir %{_datadir}/vim/vimfiles/syntax

%{_datadir}/vim/vimfiles/syntax/dockerfile.vim

%{_bindir}/nsinit

%files devel

%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md 

%{gopath}/src/%{common_path}/*

%changelog

* Fri Dec 05 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.2-4

- update libcontainer paths

- update docker.sysconfig to include DOCKER_TMPDIR

- update docker.service unitfile

- package provides docker-io-devel

* Mon Dec 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.2-3

- revert docker.service change, -H fd:// in sysconfig file

* Mon Dec 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.2-2

- update systemd files

* Tue Nov 25 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.2-1

- Resolves: rhbz#1167870 - update to v1.3.2

- Fixes CVE-2014-6407, CVE-2014-6408

* Fri Nov 14 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.1-2

- remove unused buildrequires

* Thu Nov 13 2014 Lokesh Mandvekar <lsm5@redhat.com> - 1.3.1-1

- bump to upstream v1.3.1

- patch to vendor in go-md2man and deps for manpage generation

* Thu Oct 30 2014 Dan Walsh <dwalsh@redhat.com> - 1.2.0-1.8

- Remove docker-rhel entitlment patch. This was buggy and is no longer needed

* Mon Oct 20 2014 Dan Walsh <dwalsh@redhat.com> - 1.2.0-1.7

- Add 404 patch to allow docker to continue to try to download updates with 

- different certs, even if the registry returns 404 error

* Tue Oct 7 2014 Eric Paris <eparis@redhat.com> - 1.2.0-1.6

- make docker.socket start/restart when docker starts/restarts

* Tue Sep 30 2014 Eric Paris <eparis@redhat.com> - 1.2.0-1.5

- put docker.socket back the right way

* Sat Sep 27 2014 Dan Walsh <dwalsh@redhat.com> - 1.2.0-1.4

- Remove docker.socket

* Mon Sep 22 2014 Dan Walsh <dwalsh@redhat.com> - 1.2.0-1.2

- Fix docker.service file to use /etc/sysconfig/docker-storage.service

* Mon Sep 22 2014 Dan Walsh <dwalsh@redhat.com> - 1.2.0-1.1

- Bump release to 1.2.0

- Add support for /etc/sysconfig/docker-storage

- Add Provides:golang(github.com/docker/libcontainer)

- Add provides docker-io to get through compatibility issues

- Update man pages

- Add missing pieces of libcontainer

- Devel now obsoletes golang-github-docker-libcontainer-devel

- Remove runtime dependency on golang

- Fix secrets patch

- Add -devel -pkg-devel subpackages

- Move libcontainer from -lib to -devel subpackage

- Allow docker to use /etc/pki/entitlement for certs

- New sources that satisfy nsinit deps

- Change docker client certs links

- Add nsinit

* Tue Sep 2 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-10

- Add  docker client entitlement certs

* Fri Aug 8 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-9

- Add Matt Heon patch to allow containers to work if machine is not entitled

* Thu Aug 7 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-8

- Fix handing of rhel repos

* Mon Aug 4 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-6

- Update man pages

* Mon Jul 28 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-5

- Fix environment patch

- Add /etc/machine-id patch

* Fri Jul 25 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-4

- Add Secrets Patch back in

* Fri Jul 25 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-3

- Pull in latest docker-1.1.2 code

* Fri Jul 25 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.2-2

- Update to the latest from upstream

- Add comment and envoroment patches to allow setting of comments and 

- enviroment variables from docker import

* Wed Jul 23 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.1-3

- Install docker bash completions in proper location

- Add audit_write as a default capability

* Tue Jul 22 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.1-2

- Update man pages

- Fix docker pull registry/repo

* Fri Jul 18 2014 Dan Walsh <dwalsh@redhat.com> - 1.1.1-1

- Update to latest from upstream

* Mon Jul 14 2014 Dan Walsh <dwalsh@redhat.com> - 1.0.0-10

- Pass otions from /etc/sysconfig/docker into docker.service unit file

* Thu Jul 10 2014 Dan Walsh <dwalsh@redhat.com> - 1.0.0-9

- Fix docker-registry patch to handle search

* Thu Jul 10 2014 Dan Walsh <dwalsh@redhat.com> - 1.0.0-8

- Re-add %{_datadir}/rhel/secrets/rhel7.repo

* Wed Jul 9 2014 Dan Walsh <dwalsh@redhat.com> - 1.0.0-7

- Patch: Save "COMMENT" field in Dockerfile into image content.

- Patch: Update documentation noting that SIGCHLD is not proxied.

- Patch: Escape control and nonprintable characters in docker ps

- Patch: machine-id: add container id access

- Patch: Report child error better (and later)

- Patch: Fix invalid fd race

- Patch: Super minimal host based secrets

- Patch: libcontainer: Mount cgroups in the container

- Patch: pkg/cgroups Add GetMounts() and GetAllSubsystems()

- Patch: New implementation of /run support

- Patch: Error if Docker daemon starts with BTRFS graph driver and SELinux enabled

- Patch: Updated CLI documentation for docker pull with notes on specifying URL

- Patch: Updated docker pull manpage to reflect ability to specify URL of registry.

- Patch: Docker should use /var/tmp for large temporary files.

- Patch: Add --registry-append and --registry-replace qualifier to docker daemon

- Patch: Increase size of buffer for signals

- Patch: Update documentation noting that SIGCHLD is not proxied.

- Patch: Escape control and nonprintable characters in docker ps

* Tue Jun 24 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-4

- Documentation update for --sig-proxy

- increase size of buffer for signals

- escape control and nonprintable characters in docker ps

* Tue Jun 24 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-3

- Resolves: rhbz#1111769 - CVE-2014-3499

* Thu Jun 19 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-2

- Resolves: rhbz#1109938 - upgrade to upstream version 1.0.0 + patches

  use repo: https://github.com/lsm5/docker/commits/htb2

- Resolves: rhbz#1109858 - fix race condition with secrets

- add machine-id patch:

https://github.com/vbatts/docker/commit/4f51757a50349bbbd2282953aaa3fc0e9a989741

* Wed Jun 18 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-1

- Resolves: rhbz#1109938 - upgrade to upstream version 1.0.0 + patches

  use repo: https://github.com/lsm5/docker/commits/2014-06-18-htb2

- Resolves: rhbz#1110876 - secrets changes required for subscription

management

- btrfs now available (remove old comment)

* Fri Jun 06 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-19

- build with golang-github-kr-pty-0-0.19.git98c7b80.el7

* Fri Jun 06 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-18

- update manpages

- use branch: https://github.com/lsm5/docker/commits/2014-06-06-2

* Thu Jun 05 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-17

- use branch: https://github.com/lsm5/docker/commits/2014-06-05-final2

* Thu Jun 05 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-16

- latest repo: https://github.com/lsm5/docker/commits/2014-06-05-5

- update secrets symlinks

* Mon Jun 02 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-15

- correct the rhel7.repo symlink

* Mon Jun 02 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-14

- only symlink the repo itself, not the dir

* Sun Jun 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-13

- use the repo dir itself and not repo for second symlink

* Sat May 31 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-12

- create symlinks at install time and not in scriptlets

- own symlinks in /etc/docker/secrets

* Sat May 31 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-11

- add symlinks for sharing host entitlements

* Thu May 29 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-10

- /etc/docker/secrets has permissions 750

* Thu May 29 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-9

- create and own /etc/docker/secrets

* Thu May 29 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-8

- don't use docker.sysconfig meant for sysvinit (just to avoid confusion)

* Thu May 29 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-7

- install /etc/sysconfig/docker for additional args

- use branch 2014-05-29 with modified secrets dir path

* Thu May 29 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-6

- secret store patch

* Thu May 22 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-5

- native driver: add required capabilities (dotcloud issue #5928)

* Thu May 22 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-4

- branch 2014-05-22

- rename rhel-dockerfiles dir to dockerfiles

* Wed May 21 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-3

- mount /run with correct selinux label

* Mon May 19 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-2

- add btrfs

* Mon May 19 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1-1

- use latest master

- branch: https://github.com/lsm5/docker/commits/2014-05-09-2

* Mon May 19 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-13

- add registry search list patch

* Wed May 14 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-12

- include dockerfiles for postgres, systemd/{httpd,mariadb}

* Mon May 12 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-11

- add apache, mariadb and mongodb dockerfiles

- branch 2014-05-12

* Fri May 09 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-10

- add rhel-dockerfile/mongodb

* Fri May 09 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-9

- use branch: https://github.com/lsm5/docker/commits/2014-05-09

- install rhel-dockerfile for apache

- cleanup: get rid of conditionals

- libcontainer: create dirs/files as needed for bind mounts

* Thu May 08 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-8

- fix docker top

* Tue May 06 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-7

- set container pid for process in native driver

* Tue May 06 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-6

- ensure upstream PR #5529 is included

* Mon May 05 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-5

- block push to docker index

* Thu May 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-4

- enable selinux in unitfile

* Thu May 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-3

- branch https://github.com/lsm5/docker/commits/2014-05-01-2

* Thu May 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-2

- branch https://github.com/lsm5/docker/tree/2014-05-01

* Fri Apr 25 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.0-1

- renamed (docker-io -> docker)

- rebased on 0.10.0

- branch used: https://github.com/lsm5/docker/tree/2014-04-25

- manpages packaged separately (pandoc not available on RHEL-7)

* Tue Apr 08 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.1-4.collider

- manpages merged, some more patches from alex

* Thu Apr 03 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.1-3.collider

- fix --volumes-from mount failure, include docker-images/info/tag manpages

* Tue Apr 01 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.1-2.collider

- solve deadlock issue

* Mon Mar 31 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.1-1.collider

- branch 2014-03-28, include additional docker manpages from whenry

* Thu Mar 27 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-7.collider

- env file support (vbatts)

* Mon Mar 17 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-6.collider

- dwalsh's selinux patch rewritten

- point to my docker repo as source0 (contains all patches already)

- don't require tar and libcgroup

* Fri Mar 14 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-5.collider

- add kraman's container-pid.patch

* Fri Mar 14 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-4.collider

- require docker.socket in unitfile

* Thu Mar 13 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-3.collider

- use systemd socket activation

* Wed Mar 12 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-2.collider

- add collider tag to release field

* Tue Mar 11 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.9.0-1

- upstream version bump to 0.9.0

* Mon Mar 10 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-3

- add alexl's patches upto af9bb2e3d37fcddd5e041d6ae45055f649e2fbd4

- add guelfey/go.dbus to BR

* Sun Mar 09 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-2

- use upstream commit 3ace9512bdf5c935a716ee1851d3e636e7962fac

- add dwalsh's patches for selinux, emacs-gitignore, listen_pid and

remount /var/lib/docker as --private

* Wed Feb 19 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-1

- Bug 1066841 - upstream version bump to v0.8.1

- use sysvinit files from upstream contrib

- BR golang >= 1.2-7

* Thu Feb 13 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.8.0-3

- Remove unneeded sysctl settings in initscript

  https://github.com/dotcloud/docker/pull/4125

* Sat Feb 08 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.0-2

- ignore btrfs for rhel7 and clones for now

- include vim syntax highlighting from contrib/syntax/vim

* Wed Feb 05 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.0-1

- upstream version bump

- don't use btrfs for rhel6 and clones (yet)

* Mon Jan 20 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.6-2

- bridge-utils only for rhel < 7

- discard freespace when image is removed

* Thu Jan 16 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.6-1

- upstream version bump v0.7.6

- built with golang >= 1.2

* Thu Jan 09 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.5-1

- upstream version bump to 0.7.5

* Thu Jan 09 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.4-1

- upstream version bump to 0.7.4 (BZ #1049793)

- udev rules file from upstream contrib

- unit file firewalld not used, description changes

* Mon Jan 06 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.3-3

- udev rules typo fixed (BZ 1048775)

* Sat Jan 04 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.3-2

- missed commit value in release 1, updated now

- upstream release monitoring (BZ 1048441)

* Sat Jan 04 2014 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.3-1

- upstream release bump to v0.7.3

* Thu Dec 19 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.2-2

- require xz to work with ubuntu images (BZ #1045220)

* Wed Dec 18 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.2-1

- upstream release bump to v0.7.2

* Fri Dec 06 2013 Vincent Batts <vbatts@redhat.com> - 0.7.1-1

- upstream release of v0.7.1

* Mon Dec 02 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.0-14

- sysvinit patch corrected (epel only)

- 80-docker.rules unified for udisks1 and udisks2

* Mon Dec 02 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.0-13

- removed firewall-cmd --add-masquerade

* Sat Nov 30 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.0-12

- systemd for fedora >= 18

- firewalld in unit file changed from Requires to Wants

- firewall-cmd --add-masquerade after docker daemon start in unit file

  (Michal Fojtik <mfojtik@redhat.com>), continue if not present (Michael Young

  <m.a.young@durham.ac.uk>)

- 80-docker.rules included for epel too, ENV variables need to be changed for

  udisks1

* Fri Nov 29 2013 Marek Goldmann <mgoldman@redhat.com> - 0.7.0-11

- Redirect docker log to /var/log/docker (epel only)

- Removed the '-b none' parameter from sysconfig, it's unnecessary since

  we create the bridge now automatically (epel only)

- Make sure we have the cgconfig service started before we start docker,

    RHBZ#1034919 (epel only)