# modifying the dockerinit binary breaks the SHA1 sum check by docker %global __os_install_post %{_rpmconfigdir}/brp-compress # no python3 subpackage for docker-py %global with_python3 0 # for python-websocket-client, prefix with w_ %global w_modname websocket %global w_distname websocket-client %global w_eggname websocket_client %global w_version 0.14.1 # for docker-python, prefix with dp_ %global dp_version 0.7.1 #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 d_version 1.4.1 %global import_path %{common_path}/%{repo} %global import_path_libcontainer %{common_path}/libcontainer %global commit d26b358badf659627988adb88c1ba1d64c6d2f16 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global atom_commit 3d4fd2092b1e8086c75de3db69084820e4f6d075 %global utils_commit fb94a2822356e0bb7a481a16d553b3c9de669eb8 Name: docker Version: %{d_version} Release: 37%{?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 Source0: https://github.com/rhatdan/docker/archive/%{commit}.tar.gz Source1: docker.service Source3: docker.sysconfig Source4: docker-storage.sysconfig Source5: docker-logrotate.sh Source6: README.docker-logrotate Source7: docker-network.sysconfig # Source8 is the source tarball for python-websocket-client Source8: http://pypi.python.org/packages/source/w/%{w_distname}/%{w_distname}-%{w_version}.tar.gz # Source9 is the source tarball for docker-py Source9: http://pypi.python.org/packages/source/d/docker-py/docker-py-%{dp_version}.tar.gz # Source10 is the source tarball for atomic Source10: https://github.com/rhatdan/atom/archive/%{atom_commit}.tar.gz # Source11 is the source tarball for dockertarsum and docker-fetch Source11: https://github.com/vbatts/docker-utils/archive/%{utils_commit}.tar.gz Patch1: go-md2man.patch Patch2: docker-cert-path.patch Patch3: codegangsta-cli.patch Patch4: urlparse.patch Patch5: docker-py-remove-lock.patch 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 # need xz to work with ubuntu images Requires: xz Requires: device-mapper-libs >= 1.02.90-1 Requires: subscription-manager Provides: lxc-docker = %{d_version}-%{release} Provides: docker = %{d_version}-%{release} Provides: docker-io = %{d_version}-%{release} %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 logrotate Summary: cron job to run logrotate on docker containers Requires: docker = %{version}-%{release} Provides: docker-io-logrotate = %{version}-%{release} %description logrotate This package installs %{summary}. logrotate is assumed to be installed on containers for this to work, failures are silently ignored. %package -n python-%{w_distname} Summary: WebSocket client for python Version: %{w_version} License: LGPLv2 BuildArch: noarch %description -n python-%{w_distname} python-websocket-client module is WebSocket client for python. This provides the low level APIs for WebSocket. All APIs are the synchronous functions. python-websocket-client supports only hybi-13. %package python Version: %{dp_version} License: ASL 2.0 Summary: An API client for docker written in Python BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-tools BuildRequires: python-requests Requires: docker >= %{d_version}-%{release} Requires: python-requests Requires: python-%{w_distname} >= 0.11.0 Requires: python-six >= 1.3.0 Requires: python-argparse Provides: python-docker-py = %{dp_version}-%{release} Provides: python-docker = %{dp_version}-%{release} %description python %{summary} %prep %setup -qn docker-%{commit} %patch1 -p1 %patch2 -p1 %patch3 -p1 cp %{SOURCE6} . # untar docker-utils tarball tar zxf %{SOURCE11} # untar python-websocket-client tarball tar zxf %{SOURCE8} rm -rf %{w_distname}-%{w_version}/%{w_distname}.egg-info pushd %{w_distname}-%{w_version}/websocket %patch4 -p1 popd # untar docker-py tarball tar zxf %{SOURCE9} pushd docker-py-%{dp_version} %patch5 -p1 popd # untar atom tar zxf %{SOURCE10} sed -i '/pylint/d' atom-%{atom_commit}/Makefile cp atom-%{atom_commit}/docs/* ./docs/man/. %build mkdir _build pushd _build mkdir -p src/github.com/{docker,vbatts} ln -s $(dirs +1 -l) src/github.com/docker/docker ln -s $(dirs +1 -l)/docker-utils-%{utils_commit} src/github.com/vbatts/docker-utils popd export DOCKER_GITCOMMIT="%{shortcommit}/%{d_version}" export DOCKER_BUILDTAGS='selinux btrfs_noversion' 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 go-md2man for building manpages go build github.com/cpuguy83/go-md2man # build dockertarsum and docker-fetch(commented out) go build github.com/vbatts/docker-utils/cmd/docker-fetch go build github.com/vbatts/docker-utils/cmd/dockertarsum 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 # build python-websocket-client pushd %{w_distname}-%{w_version} %{__python} setup.py build popd # build docker-py pushd docker-py-%{dp_version} %{__python} setup.py build popd # build atomic pushd atom-%{atom_commit} make all popd %install # install binary install -d %{buildroot}%{_bindir} install -p -m 755 bundles/%{d_version}-dev/dynbinary/docker-%{d_version}-dev %{buildroot}%{_bindir}/docker # install dockertarsum and docker-fetch install -p -m 755 _build/src/docker-fetch %{buildroot}%{_bindir} install -p -m 755 _build/src/dockertarsum %{buildroot}%{_bindir} # install dockerinit install -d %{buildroot}%{_libexecdir}/docker install -p -m 755 bundles/%{d_version}-dev/dynbinary/dockerinit-%{d_version}-dev %{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 fish completion # create, install and own /usr/share/fish/vendor_completions.d until # upstream fish provides it install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d install -p -m 644 contrib/completion/fish/docker.fish %{buildroot}%{_datadir}/fish/vendor_completions.d # install container logrotate cron script install -dp %{buildroot}%{_sysconfdir}/cron.daily/ install -p -m 755 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.daily/docker-logrotate # 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 zsh completion install -d %{buildroot}%{_datadir}/zsh/site-functions install -p -m 644 contrib/completion/zsh/_docker %{buildroot}%{_datadir}/zsh/site-functions # 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} # for additional args install -d %{buildroot}%{_sysconfdir}/sysconfig/ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage install -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/docker-network # 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 docker config directory install -dp %{buildroot}%{_sysconfdir}/docker/ # install python-websocket-client pushd %{w_distname}-%{w_version} %{__python} setup.py install -O1 --skip-build --root=%{buildroot} mv %{buildroot}/%{_bindir}/wsdump.py \ %{buildroot}/%{_bindir}/wsdump # unbundle cacert (python-websocket-client) rm %{buildroot}/%{python2_sitelib}/%{w_modname}/cacert.pem # And link in the mozilla ca (python-websocket-client) ln -s /etc/pki/tls/cert.pem \ %{buildroot}/%{python2_sitelib}/%{w_modname}/cacert.pem # remove tests that got installed into the buildroot (python-websocket-client) rm -rf %{buildroot}/%{python2_sitelib}/tests/ # Remove executable bit from installed files. (python-websocket-client) find %{buildroot}/%{python2_sitelib} -type f -exec chmod -x {} \; popd # install docker-py pushd docker-py-%{dp_version} %{__python} setup.py install --root %{buildroot} popd # install atomic pushd atom-%{atom_commit} make install DESTDIR=%{buildroot} popd %check [ ! -e /run/docker.sock ] || { mkdir test_dir pushd test_dir git clone https://%{import_path} pushd docker make test popd popd } %pre getent passwd dockerroot > /dev/null || %{_sbindir}/useradd -r -d %{_sharedstatedir}/docker -s /sbin/nologin -c "Docker User" dockerroot 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/docker* %{_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 %{_libexecdir}/docker %{_unitdir}/docker.service %config(noreplace) %{_sysconfdir}/sysconfig/docker %config(noreplace) %{_sysconfdir}/sysconfig/docker-storage %config(noreplace) %{_sysconfdir}/sysconfig/docker-network %{_datadir}/bash-completion/completions/docker %dir %{_sharedstatedir}/docker %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/80-docker.rules %dir %{_datadir}/fish/vendor_completions.d/ %{_datadir}/fish/vendor_completions.d/docker.fish %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 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_docker %{_sysconfdir}/docker %{_bindir}/docker-fetch %{_bindir}/dockertarsum %files logrotate %doc README.docker-logrotate %{_sysconfdir}/cron.daily/docker-logrotate %files -n python-websocket-client %doc %{w_distname}-%{w_version}/{README.rst,LICENSE} %{python2_sitelib}/%{w_modname}/ %{python2_sitelib}/%{w_eggname}*%{w_version}* %{_bindir}/wsdump %files python %doc docker-py-%{dp_version}/{LICENSE,README.md} %config(noreplace) %{_sysconfdir}/sysconfig/atomic %{python_sitelib}/docker %{python_sitelib}/docker_py-%{dp_version}-py2*.egg-info %{python_sitelib}/atomic*.egg-info %{_sysconfdir}/profile.d/atomic.sh %{_bindir}/atomic %{_mandir}/man1/atomic* %changelog * Fri Jan 30 2015 Lokesh Mandvekar - 1.4.1-37 - add extra options to /etc/sysconfig/docker to add/block registries - build atom commit#3d4fd20 * Fri Jan 30 2015 Lokesh Mandvekar - 1.4.1-36 - remove dependency on python-backports * Fri Jan 30 2015 Lokesh Mandvekar - 1.4.1-35 - build atomic rhatdan/master commit#973142b - build docker rhatdan/1.4.1-beta2 commit#d26b358 * Fri Jan 30 2015 Michal Minar - 1.4.1-34 - added patch fixed tagging issue * Fri Jan 30 2015 Michal Minar - 1.4.1-33 - build docker rhatdan/1.4.1-beta2 commit#b024f0f - --registry-(replace|preprend) replaced with --(add|block)-registry * Thu Jan 29 2015 Lokesh Mandvekar - 1.4.1-32 - build atom commit#567c2c8 * Thu Jan 29 2015 Lokesh Mandvekar - 1.4.1-31 - build atom commit#b9e02ad * Wed Jan 28 2015 Lokesh Mandvekar - 1.4.1-30 - Require python-backports >= 1.0-8 for docker-python * Wed Jan 28 2015 Lokesh Mandvekar - 1.4.1-29 - build docker rhatdan/1.4.1-beta2 commit#0af307b - --registry-replace|prepend flags via Michal Minar - build atomic rhatdan/master commit#37f9be0 * Tue Jan 27 2015 Lokesh Mandvekar - 1.4.1-27 - patch to avoid crash in atomic host * Tue Jan 27 2015 Lokesh Mandvekar - 1.4.1-26 - build docker rhatdan/1.4.1-beta2 commit#0b4cade - build atomic rhatdan/master commit#b8c7b9d - build docker-utils vbatts/master commit#fb94a28 * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-25 - build atomic commit#fcbc57b with fix for install/upgrade/status - build docker rhatdan/1.4.1-beta2 commit#f476836 * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-24 - install dockertarsum from github.com/vbatts/docker-utils * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-23 - build rhatdan/atom commit#ef16d40 - try urlparse from six, else from argparse * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-22 - use python-argparse to provide urlparse * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-21 - move atomic bits into -python subpackage * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-20 - update atom commit#10fc4c8 * Fri Jan 23 2015 Lokesh Mandvekar - 1.4.1-19 - build rhatdan/1.4.1-beta2 commit#35a8dc5 - --registry-prepend instead of --registry-append * Thu Jan 22 2015 Lokesh Mandvekar - 1.4.1-18 - don't install nsinit * Thu Jan 22 2015 Lokesh Mandvekar - 1.4.1-17 - install atomic and manpages - don't provide -devel subpackage * Thu Jan 22 2015 Lokesh Mandvekar - 1.4.1-16 - install python-websocket-client and python-docker as subpackages * Thu Jan 22 2015 Lokesh Mandvekar - 1.4.1-15 - build rhatdan/1.4.1-beta2 commit#06670da - install subscription manager * Tue Jan 20 2015 Lokesh Mandvekar - 1.4.1-14 - increment release number to avoid conflict with 7.0 * Tue Jan 20 2015 Lokesh Mandvekar - 1.4.1-13 - build rhatdan/1.4.1-beta2 commit#2de8e5d - Resolves: rhbz#1180718 - MountFlags=slave in unitfile * Mon Jan 19 2015 Lokesh Mandvekar - 1.4.1-12 - build rhatdan/1.4.1-beta2 commit#218805f * Mon Jan 19 2015 Lokesh Mandvekar - 1.4.1-11 - build rhatdan/1.4.1-beta2 commit#4b7addf * Fri Jan 16 2015 Lokesh Mandvekar - 1.4.1-10 - build rhatdan/1.4.1-beta2 commit #a0c7884 - socket activation not used - include docker_transition_unconfined boolean info and disable socket activation in /etc/sysconfig/docker - docker group not created * Fri Jan 16 2015 Lokesh Mandvekar - 1.4.1-9 - run all tests and not just unit tests - replace codegansta.tgz with codegangsta-cli.patch * Thu Jan 15 2015 Lokesh Mandvekar - 1.4.1-8 - build rhatdan/1.4.1-beta2 commit #6ee2421 * Wed Jan 14 2015 Lokesh Mandvekar - 1.4.1-7 - build rhatdan/1.4.1-beta2 01a64e011da131869b42be8b2f11f540fd4b8f33 - run tests inside a docker repo during check phase * Mon Jan 12 2015 Lokesh Mandvekar - 1.4.1-6 - build rhatdan/1.4.1-beta2 01a64e011da131869b42be8b2f11f540fd4b8f33 * Wed Jan 07 2015 Lokesh Mandvekar - 1.4.1-5 - own /etc/docker - include check for unit tests * Fri Dec 19 2014 Lokesh Mandvekar - 1.4.1-4 - Install vim and shell completion files in main package itself * Thu Dec 18 2014 Lokesh Mandvekar - 1.4.1-3 - rename cron script - change enable/disable to true/false * Thu Dec 18 2014 Lokesh Mandvekar - 1.4.1-2 - Enable the logrotate cron job by default, disable via sysconfig variable - Install docker-network and docker-container-logrotate sysconfig files * Thu Dec 18 2014 Lokesh Mandvekar - 1.4.1-1 - Resolves: rhbz#1174351 - update to 1.4.1 - Provide subpackages for fish and zsh completion and vim syntax highlighting - Provide subpackage to run logrotate on running containers as a daily cron job * Mon Dec 15 2014 Lokesh Mandvekar - 1.4.0-1 - Resolves: rhbz#1174266 - update to 1.4.0 - Fixes: CVE-2014-9357, CVE-2014-9358 - uses /etc/docker as cert path - create dockerroot user - skip btrfs version check * Fri Dec 05 2014 Lokesh Mandvekar - 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 - 1.3.2-3 - revert docker.service change, -H fd:// in sysconfig file * Mon Dec 01 2014 Lokesh Mandvekar - 1.3.2-2 - update systemd files * Tue Nov 25 2014 Lokesh Mandvekar - 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 - 1.3.1-2 - remove unused buildrequires * Thu Nov 13 2014 Lokesh Mandvekar - 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 - 1.2.0-1.8 - Remove docker-rhel entitlment patch. This was buggy and is no longer needed * Mon Oct 20 2014 Dan Walsh - 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 - 1.2.0-1.6 - make docker.socket start/restart when docker starts/restarts * Tue Sep 30 2014 Eric Paris - 1.2.0-1.5 - put docker.socket back the right way * Sat Sep 27 2014 Dan Walsh - 1.2.0-1.4 - Remove docker.socket * Mon Sep 22 2014 Dan Walsh - 1.2.0-1.2 - Fix docker.service file to use /etc/sysconfig/docker-storage.service * Mon Sep 22 2014 Dan Walsh - 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 - 1.1.2-10 - Add docker client entitlement certs * Fri Aug 8 2014 Dan Walsh - 1.1.2-9 - Add Matt Heon patch to allow containers to work if machine is not entitled * Thu Aug 7 2014 Dan Walsh - 1.1.2-8 - Fix handing of rhel repos * Mon Aug 4 2014 Dan Walsh - 1.1.2-6 - Update man pages * Mon Jul 28 2014 Dan Walsh - 1.1.2-5 - Fix environment patch - Add /etc/machine-id patch * Fri Jul 25 2014 Dan Walsh - 1.1.2-4 - Add Secrets Patch back in * Fri Jul 25 2014 Dan Walsh - 1.1.2-3 - Pull in latest docker-1.1.2 code * Fri Jul 25 2014 Dan Walsh - 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 - 1.1.1-3 - Install docker bash completions in proper location - Add audit_write as a default capability * Tue Jul 22 2014 Dan Walsh - 1.1.1-2 - Update man pages - Fix docker pull registry/repo * Fri Jul 18 2014 Dan Walsh - 1.1.1-1 - Update to latest from upstream * Mon Jul 14 2014 Dan Walsh - 1.0.0-10 - Pass otions from /etc/sysconfig/docker into docker.service unit file * Thu Jul 10 2014 Dan Walsh - 1.0.0-9 - Fix docker-registry patch to handle search * Thu Jul 10 2014 Dan Walsh - 1.0.0-8 - Re-add %{_datadir}/rhel/secrets/rhel7.repo * Wed Jul 9 2014 Dan Walsh - 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 - 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 - 1.0.0-3 - Resolves: rhbz#1111769 - CVE-2014-3499 * Thu Jun 19 2014 Lokesh Mandvekar - 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 - 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 - 0.11.1-19 - build with golang-github-kr-pty-0-0.19.git98c7b80.el7 * Fri Jun 06 2014 Lokesh Mandvekar - 0.11.1-18 - update manpages - use branch: https://github.com/lsm5/docker/commits/2014-06-06-2 * Thu Jun 05 2014 Lokesh Mandvekar - 0.11.1-17 - use branch: https://github.com/lsm5/docker/commits/2014-06-05-final2 * Thu Jun 05 2014 Lokesh Mandvekar - 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 - 0.11.1-15 - correct the rhel7.repo symlink * Mon Jun 02 2014 Lokesh Mandvekar - 0.11.1-14 - only symlink the repo itself, not the dir * Sun Jun 01 2014 Lokesh Mandvekar - 0.11.1-13 - use the repo dir itself and not repo for second symlink * Sat May 31 2014 Lokesh Mandvekar - 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 - 0.11.1-11 - add symlinks for sharing host entitlements * Thu May 29 2014 Lokesh Mandvekar - 0.11.1-10 - /etc/docker/secrets has permissions 750 * Thu May 29 2014 Lokesh Mandvekar - 0.11.1-9 - create and own /etc/docker/secrets * Thu May 29 2014 Lokesh Mandvekar - 0.11.1-8 - don't use docker.sysconfig meant for sysvinit (just to avoid confusion) * Thu May 29 2014 Lokesh Mandvekar - 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 - 0.11.1-6 - secret store patch * Thu May 22 2014 Lokesh Mandvekar - 0.11.1-5 - native driver: add required capabilities (dotcloud issue #5928) * Thu May 22 2014 Lokesh Mandvekar - 0.11.1-4 - branch 2014-05-22 - rename rhel-dockerfiles dir to dockerfiles * Wed May 21 2014 Lokesh Mandvekar - 0.11.1-3 - mount /run with correct selinux label * Mon May 19 2014 Lokesh Mandvekar - 0.11.1-2 - add btrfs * Mon May 19 2014 Lokesh Mandvekar - 0.11.1-1 - use latest master - branch: https://github.com/lsm5/docker/commits/2014-05-09-2 * Mon May 19 2014 Lokesh Mandvekar - 0.10.0-13 - add registry search list patch * Wed May 14 2014 Lokesh Mandvekar - 0.10.0-12 - include dockerfiles for postgres, systemd/{httpd,mariadb} * Mon May 12 2014 Lokesh Mandvekar - 0.10.0-11 - add apache, mariadb and mongodb dockerfiles - branch 2014-05-12 * Fri May 09 2014 Lokesh Mandvekar - 0.10.0-10 - add rhel-dockerfile/mongodb * Fri May 09 2014 Lokesh Mandvekar - 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 - 0.10.0-8 - fix docker top * Tue May 06 2014 Lokesh Mandvekar - 0.10.0-7 - set container pid for process in native driver * Tue May 06 2014 Lokesh Mandvekar - 0.10.0-6 - ensure upstream PR #5529 is included * Mon May 05 2014 Lokesh Mandvekar - 0.10.0-5 - block push to docker index * Thu May 01 2014 Lokesh Mandvekar - 0.10.0-4 - enable selinux in unitfile * Thu May 01 2014 Lokesh Mandvekar - 0.10.0-3 - branch https://github.com/lsm5/docker/commits/2014-05-01-2 * Thu May 01 2014 Lokesh Mandvekar - 0.10.0-2 - branch https://github.com/lsm5/docker/tree/2014-05-01 * Fri Apr 25 2014 Lokesh Mandvekar - 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 - 0.9.1-4.collider - manpages merged, some more patches from alex * Thu Apr 03 2014 Lokesh Mandvekar - 0.9.1-3.collider - fix --volumes-from mount failure, include docker-images/info/tag manpages * Tue Apr 01 2014 Lokesh Mandvekar - 0.9.1-2.collider - solve deadlock issue * Mon Mar 31 2014 Lokesh Mandvekar - 0.9.1-1.collider - branch 2014-03-28, include additional docker manpages from whenry * Thu Mar 27 2014 Lokesh Mandvekar - 0.9.0-7.collider - env file support (vbatts) * Mon Mar 17 2014 Lokesh Mandvekar - 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 - 0.9.0-5.collider - add kraman's container-pid.patch * Fri Mar 14 2014 Lokesh Mandvekar - 0.9.0-4.collider - require docker.socket in unitfile * Thu Mar 13 2014 Lokesh Mandvekar - 0.9.0-3.collider - use systemd socket activation * Wed Mar 12 2014 Lokesh Mandvekar - 0.9.0-2.collider - add collider tag to release field * Tue Mar 11 2014 Lokesh Mandvekar - 0.9.0-1 - upstream version bump to 0.9.0 * Mon Mar 10 2014 Lokesh Mandvekar - 0.8.1-3 - add alexl's patches upto af9bb2e3d37fcddd5e041d6ae45055f649e2fbd4 - add guelfey/go.dbus to BR * Sun Mar 09 2014 Lokesh Mandvekar - 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 - 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 - 0.8.0-3 - Remove unneeded sysctl settings in initscript https://github.com/dotcloud/docker/pull/4125 * Sat Feb 08 2014 Lokesh Mandvekar - 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 - 0.8.0-1 - upstream version bump - don't use btrfs for rhel6 and clones (yet) * Mon Jan 20 2014 Lokesh Mandvekar - 0.7.6-2 - bridge-utils only for rhel < 7 - discard freespace when image is removed * Thu Jan 16 2014 Lokesh Mandvekar - 0.7.6-1 - upstream version bump v0.7.6 - built with golang >= 1.2 * Thu Jan 09 2014 Lokesh Mandvekar - 0.7.5-1 - upstream version bump to 0.7.5 * Thu Jan 09 2014 Lokesh Mandvekar - 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 - 0.7.3-3 - udev rules typo fixed (BZ 1048775) * Sat Jan 04 2014 Lokesh Mandvekar - 0.7.3-2 - missed commit value in release 1, updated now - upstream release monitoring (BZ 1048441) * Sat Jan 04 2014 Lokesh Mandvekar - 0.7.3-1 - upstream release bump to v0.7.3 * Thu Dec 19 2013 Lokesh Mandvekar - 0.7.2-2 - require xz to work with ubuntu images (BZ #1045220) * Wed Dec 18 2013 Lokesh Mandvekar - 0.7.2-1 - upstream release bump to v0.7.2 * Fri Dec 06 2013 Vincent Batts - 0.7.1-1 - upstream release of v0.7.1 * Mon Dec 02 2013 Lokesh Mandvekar - 0.7.0-14 - sysvinit patch corrected (epel only) - 80-docker.rules unified for udisks1 and udisks2 * Mon Dec 02 2013 Lokesh Mandvekar - 0.7.0-13 - removed firewall-cmd --add-masquerade * Sat Nov 30 2013 Lokesh Mandvekar - 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 ), continue if not present (Michael Young ) - 80-docker.rules included for epel too, ENV variables need to be changed for udisks1 * Fri Nov 29 2013 Marek Goldmann - 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) * Thu Nov 28 2013 Lokesh Mandvekar - 0.7.0-10 - udev rules added for fedora >= 19 BZ 1034095 - epel testing pending * Thu Nov 28 2013 Lokesh Mandvekar - 0.7.0-9 - requires and started after firewalld * Thu Nov 28 2013 Lokesh Mandvekar - 0.7.0-8 - iptables-fix patch corrected * Thu Nov 28 2013 Lokesh Mandvekar - 0.7.0-7 - use upstream tarball and patch with mgoldman's commit * Thu Nov 28 2013 Lokesh Mandvekar - 0.7.0-6 - using mgoldman's shortcommit value 0ff9bc1 for package (BZ #1033606) - https://github.com/dotcloud/docker/pull/2907 * Wed Nov 27 2013 Adam Miller - 0.7.0-5 - Fix up EL6 preun/postun to not fail on postun scripts * Wed Nov 27 2013 Lokesh Mandvekar - 0.7.0-4 - brctl patch for rhel <= 7 * Wed Nov 27 2013 Vincent Batts - 0.7.0-3 - Patch how the bridge network is set up on RHEL (BZ #1035436) * Wed Nov 27 2013 Vincent Batts - 0.7.0-2 - add libcgroup require (BZ #1034919) * Tue Nov 26 2013 Marek Goldmann - 0.7.0-1 - Upstream release 0.7.0 - Using upstream script to build the binary * Mon Nov 25 2013 Vincent Batts - 0.7-0.20.rc7 - correct the build time defines (bz#1026545). Thanks dan-fedora. * Fri Nov 22 2013 Adam Miller - 0.7-0.19.rc7 - Remove xinetd entry, added sysvinit * Fri Nov 22 2013 Lokesh Mandvekar - 0.7-0.18.rc7 - rc version bump * Wed Nov 20 2013 Lokesh Mandvekar - 0.7-0.17.rc6 - removed ExecStartPost lines from docker.service (BZ #1026045) - dockerinit listed in files * Wed Nov 20 2013 Vincent Batts - 0.7-0.16.rc6 - adding back the none bridge patch * Wed Nov 20 2013 Vincent Batts - 0.7-0.15.rc6 - update docker source to crosbymichael/0.7.0-rc6 - bridge-patch is not needed on this branch * Tue Nov 19 2013 Vincent Batts - 0.7-0.14.rc5 - update docker source to crosbymichael/0.7-rc5 - update docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe - static magic - place dockerinit in a libexec - add sqlite dependency * Sat Nov 02 2013 Lokesh Mandvekar - 0.7-0.13.dm - docker.service file sets iptables rules to allow container networking, this is a stopgap approach, relevant pull request here: https://github.com/dotcloud/docker/pull/2527 * Sat Oct 26 2013 Lokesh Mandvekar - 0.7-0.12.dm - dm branch - dockerinit -> docker-init * Tue Oct 22 2013 Lokesh Mandvekar - 0.7-0.11.rc4 - passing version information for docker build BZ #1017186 * Sat Oct 19 2013 Lokesh Mandvekar - 0.7-0.10.rc4 - rc version bump - docker-init -> dockerinit - zsh completion script installed to /usr/share/zsh/site-functions * Fri Oct 18 2013 Lokesh Mandvekar - 0.7-0.9.rc3 - lxc-docker version matches package version * Fri Oct 18 2013 Lokesh Mandvekar - 0.7-0.8.rc3 - double quotes removed from buildrequires as per existing golang rules * Fri Oct 11 2013 Lokesh Mandvekar - 0.7-0.7.rc3 - xinetd file renamed to docker.xinetd for clarity * Thu Oct 10 2013 Lokesh Mandvekar - 0.7-0.6.rc3 - patched for el6 to use sphinx-1.0-build * Wed Oct 09 2013 Lokesh Mandvekar - 0.7-0.5.rc3 - rc3 version bump - exclusivearch x86_64 * Wed Oct 09 2013 Lokesh Mandvekar - 0.7-0.4.rc2 - debuginfo not Go-ready yet, skipped * Wed Oct 09 2013 Lokesh Mandvekar - 0.7-0.3.rc2 - debuginfo package generated - buildrequires listed with versions where needed - conditionals changed to reflect systemd or not - docker commit value not needed - versioned provides lxc-docker * Mon Oct 07 2013 Lokesh Mandvekar - 0.7-2.rc2 - rc branch includes devmapper - el6 BZ #1015865 fix included * Sun Oct 06 2013 Lokesh Mandvekar - 0.7-1 - version bump, includes devicemapper - epel conditionals included - buildrequires sqlite-devel * Fri Oct 04 2013 Lokesh Mandvekar - 0.6.3-4.devicemapper - docker-io service enables IPv4 and IPv6 forwarding - docker user not needed - golang not supported on ppc64, docker-io excluded too * Thu Oct 03 2013 Lokesh Mandvekar - 0.6.3-3.devicemapper - Docker rebuilt with latest kr/pty, first run issue solved * Fri Sep 27 2013 Marek Goldmann - 0.6.3-2.devicemapper - Remove setfcap from lxc.cap.drop to make setxattr() calls working in the containers, RHBZ#1012952 * Thu Sep 26 2013 Lokesh Mandvekar 0.6.3-1.devicemapper - version bump - new version solves docker push issues * Tue Sep 24 2013 Lokesh Mandvekar 0.6.2-14.devicemapper - package requires lxc * Tue Sep 24 2013 Lokesh Mandvekar 0.6.2-13.devicemapper - package requires tar * Tue Sep 24 2013 Lokesh Mandvekar 0.6.2-12.devicemapper - /var/lib/docker installed - package also provides lxc-docker * Mon Sep 23 2013 Lokesh Mandvekar 0.6.2-11.devicemapper - better looking url * Mon Sep 23 2013 Lokesh Mandvekar 0.6.2-10.devicemapper - release tag changed to denote devicemapper patch * Mon Sep 23 2013 Lokesh Mandvekar 0.6.2-9 - device-mapper-devel is a buildrequires for alex's code - docker.service listed as a separate source file * Sun Sep 22 2013 Matthew Miller 0.6.2-8 - install bash completion - use -v for go build to show progress * Sun Sep 22 2013 Matthew Miller 0.6.2-7 - build and install separate docker-init * Sun Sep 22 2013 Matthew Miller 0.6.2-4 - update to use new source-only golang lib packages * Sat Sep 21 2013 Lokesh Mandvekar 0.6.2-3 - man page generation from docs/. - systemd service file created - dotcloud/tar no longer required * Fri Sep 20 2013 Lokesh Mandvekar 0.6.2-2 - patched with alex larsson's devmapper code * Wed Sep 18 2013 Lokesh Mandvekar 0.6.2-1 - Version bump * Tue Sep 10 2013 Lokesh Mandvekar 0.6.1-2 - buildrequires updated - package renamed to docker-io * Fri Aug 30 2013 Lokesh Mandvekar 0.6.1-1 - Version bump - Package name change from lxc-docker to docker - Makefile patched from 0.5.3 * Wed Aug 28 2013 Lokesh Mandvekar 0.5.3-5 - File permissions settings included * Wed Aug 28 2013 Lokesh Mandvekar 0.5.3-4 - Credits in changelog modified as per reference's request * Tue Aug 27 2013 Lokesh Mandvekar 0.5.3-3 - Dependencies listed as rpm packages instead of tars - Install section added * Mon Aug 26 2013 Lokesh Mandvekar 0.5.3-2 - Github packaging - Deps not downloaded at build time courtesy Elan Ruusamäe - Manpage and other docs installed * Fri Aug 23 2013 Lokesh Mandvekar 0.5.3-1 - Initial fedora package - Some credit to Elan Ruusamäe (glen@pld-linux.org)