golang August 2014

golang@lists.fedoraproject.org

6 participants
316 discussions

[docker-io/f20] remove unused patches
by Lokesh Mandvekar 01 Aug '14

01 Aug '14

commit f26d885e1d43e566e6950e39d34042dec1003241 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:54:24 2014 -0500 remove unused patches finalize-namespace.patch | 64 ---------------------------------------------- sources | 2 +- 2 files changed, 1 insertions(+), 65 deletions(-) --- diff --git a/sources b/sources index 3ab3623..06b3414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c835295e1e0609affe9a3c7ec75d7240 v1.0.0.tar.gz +2e02d5288ecd6cbd9a6c3e4fd3b81ffc v1.1.2.tar.gz

1 0

[docker-io/f20] Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements
by Lokesh Mandvekar 01 Aug '14

01 Aug '14

commit 0db59b4a055a940236460e51cbd5a3a972cfe0df Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:49:08 2014 -0500 Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements docker-io.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 1209a87..ed31edd 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -445,7 +445,7 @@ exit 0 %changelog * Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 -- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) +- Resolves: rhbz#1124036 - update to upstream v1.1.2 * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer

1 0

[docker-io/f20] upgrade to 1.1.2
by Lokesh Mandvekar 01 Aug '14

01 Aug '14

commit d2b38492df5b7d9c09be85af8335ca7e6200b1db Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Jul 25 13:45:59 2014 -0500 upgrade to 1.1.2 docker-io.spec | 108 ++++++++---------------------------- docker.service | 7 +- upstream-patched-archive-tar.patch | 86 ++++++++++++---------------- 3 files changed, 63 insertions(+), 138 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index f37e502..1209a87 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -5,23 +5,22 @@ # so stripping the binaries breaks docker %global debug_package %{nil} -%global import_path github.com/dotcloud/docker -%global commit 63fe64c471e7d76be96a625350468dfc65c06c31 +%global import_path github.com/docker/docker +%global commit d84a070e476ce923dd03e28232564a87704613ab %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: docker-io -Version: 1.0.0 -Release: 10%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 Patch1: upstream-patched-archive-tar.patch -Patch2: finalize-namespace.patch # Resolves: rhbz#1119849 - add AUDIT_WRITE capablility -Patch3: audit-write.patch -URL: http://www.docker.io -# only x86_64 for now: https://github.com/dotcloud/docker/issues/136 +Patch2: audit-write.patch +URL: http://www.docker.com +# only x86_64 for now: https://github.com/docker/docker/issues/136 ExclusiveArch: x86_64 -Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz +Source0: https://github.com/docker/docker/archive/v%{version}.tar.gz Source1: docker.service Source2: docker.sysconfig Source3: docker.socket @@ -42,6 +41,8 @@ BuildRequires: golang(code.google.com/p/go.net/websocket) BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) # RHBZ#1109039 use syndtr/gocapability >= 0-0.7 BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/tchap/go-patricia/patricia) BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) @@ -154,7 +155,6 @@ Provides: golang(%{import_path}/pkg/user) = %{version}-%{release} Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} %description pkg-devel -This is the source libraries for docker. These source librariees are provided by docker, but are independent of docker specific logic. The import paths of %{import_path}/pkg/... @@ -162,8 +162,7 @@ The import paths of %{import_path}/pkg/... %setup -q -n docker-%{version} rm -rf vendor %patch1 -p1 -b upstream-patched-archive-tar -%patch2 -p1 -b finalize-namespace -%patch3 -p1 +%patch2 -p1 rm daemon/execdriver/native/template/*.go.orig %build @@ -176,7 +175,7 @@ export DOCKER_BUILDTAGS='selinux' export GOPATH=$(pwd)/_build:%{gopath} hack/make.sh dynbinary -contrib/man/md/md2man-all.sh +docs/man/md2man-all.sh cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax cp contrib/syntax/vim/README.md README-vim-syntax.md @@ -189,9 +188,9 @@ install -d %{buildroot}%{_libexecdir}/docker install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit # install manpage install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 contrib/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man5 -install -p -m 644 contrib/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 # install bash completion install -d %{buildroot}%{_sysconfdir}/bash_completion.d install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash @@ -240,7 +239,6 @@ exit 0 %systemd_postun_with_restart docker %files -%defattr(-,root,root,-) %doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md %doc LICENSE-vim-syntax README-vim-syntax.md %config(noreplace) %{_sysconfdir}/sysconfig/docker @@ -265,7 +263,6 @@ exit 0 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim %files devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/api %{gopath}/src/%{import_path}/api/MAINTAINERS @@ -273,6 +270,7 @@ exit 0 %{gopath}/src/%{import_path}/api/*.go %{gopath}/src/%{import_path}/api/client/*.go %dir %{gopath}/src/%{import_path}/api/server +%{gopath}/src/%{import_path}/api/server/MAINTAINERS %{gopath}/src/%{import_path}/api/server/*.go %dir %{gopath}/src/%{import_path}/archive %{gopath}/src/%{import_path}/archive/MAINTAINERS @@ -292,6 +290,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/lxc +%{gopath}/src/%{import_path}/daemon/execdriver/lxc/MAINTAINERS %{gopath}/src/%{import_path}/daemon/execdriver/lxc/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/native %{gopath}/src/%{import_path}/daemon/execdriver/native/*.go @@ -332,12 +331,6 @@ exit 0 %dir %{gopath}/src/%{import_path}/engine %{gopath}/src/%{import_path}/engine/MAINTAINERS %{gopath}/src/%{import_path}/engine/*.go -%dir %{gopath}/src/%{import_path}/engine/rengine -%{gopath}/src/%{import_path}/engine/rengine/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn -%{gopath}/src/%{import_path}/engine/spawn/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn/subengine -%{gopath}/src/%{import_path}/engine/spawn/subengine/*.go %dir %{gopath}/src/%{import_path}/graph %{gopath}/src/%{import_path}/graph/*.go %{gopath}/src/%{import_path}/graph/*.goupstream-patched-archive-tar @@ -374,73 +367,17 @@ exit 0 %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar %files pkg-devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/pkg %{gopath}/src/%{import_path}/pkg/README.md -%dir %{gopath}/src/%{import_path}/pkg/apparmor -%{gopath}/src/%{import_path}/pkg/apparmor/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam -%{gopath}/src/%{import_path}/pkg/beam/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/beam/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/data -%{gopath}/src/%{import_path}/pkg/beam/data/*.go -%{gopath}/src/%{import_path}/pkg/beam/data/netstring.txt -%dir %{gopath}/src/%{import_path}/pkg/beam/examples -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts/*.ds -%dir %{gopath}/src/%{import_path}/pkg/dockerscript -%{gopath}/src/%{import_path}/pkg/dockerscript/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/dockerscript/*.go -%dir %{gopath}/src/%{import_path}/pkg/dockerscript/scanner -%{gopath}/src/%{import_path}/pkg/dockerscript/scanner/*.go %dir %{gopath}/src/%{import_path}/pkg/graphdb %{gopath}/src/%{import_path}/pkg/graphdb/MAINTAINERS %{gopath}/src/%{import_path}/pkg/graphdb/*.go %dir %{gopath}/src/%{import_path}/pkg/iptables %{gopath}/src/%{import_path}/pkg/iptables/MAINTAINERS %{gopath}/src/%{import_path}/pkg/iptables/*.go -%dir %{gopath}/src/%{import_path}/pkg/label -%{gopath}/src/%{import_path}/pkg/label/*.go %dir %{gopath}/src/%{import_path}/pkg/listenbuffer %{gopath}/src/%{import_path}/pkg/listenbuffer/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer -%{gopath}/src/%{import_path}/pkg/libcontainer/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/libcontainer/README.md -%{gopath}/src/%{import_path}/pkg/libcontainer/TODO.md -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/console -%{gopath}/src/%{import_path}/pkg/libcontainer/console/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/container.json -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/devices -%{gopath}/src/%{import_path}/pkg/libcontainer/devices/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/namespaces -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/init.gofinalize-namespace -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/network -%{gopath}/src/%{import_path}/pkg/libcontainer/network/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/nsinit -%{gopath}/src/%{import_path}/pkg/libcontainer/nsinit/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities -%{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict -%{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/utils -%{gopath}/src/%{import_path}/pkg/libcontainer/utils/*.go %dir %{gopath}/src/%{import_path}/pkg/mflag %{gopath}/src/%{import_path}/pkg/mflag/LICENSE %{gopath}/src/%{import_path}/pkg/mflag/MAINTAINERS @@ -453,9 +390,6 @@ exit 0 %{gopath}/src/%{import_path}/pkg/mount/*.go %dir %{gopath}/src/%{import_path}/pkg/namesgenerator %{gopath}/src/%{import_path}/pkg/namesgenerator/*.go -%dir %{gopath}/src/%{import_path}/pkg/netlink -%{gopath}/src/%{import_path}/pkg/netlink/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/netlink/*.go %dir %{gopath}/src/%{import_path}/pkg/networkfs %{gopath}/src/%{import_path}/pkg/networkfs/MAINTAINERS %dir %{gopath}/src/%{import_path}/pkg/networkfs/etchosts @@ -465,10 +399,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/proxy %{gopath}/src/%{import_path}/pkg/proxy/MAINTAINERS %{gopath}/src/%{import_path}/pkg/proxy/*.go -%dir %{gopath}/src/%{import_path}/pkg/selinux -%{gopath}/src/%{import_path}/pkg/selinux/*.go %dir %{gopath}/src/%{import_path}/pkg/signal -%{gopath}/src/%{import_path}/pkg/signal/MAINTAINERS %{gopath}/src/%{import_path}/pkg/signal/*.go %dir %{gopath}/src/%{import_path}/pkg/symlink %{gopath}/src/%{import_path}/pkg/symlink/MAINTAINERS @@ -492,6 +423,10 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/systemd %{gopath}/src/%{import_path}/pkg/systemd/MAINTAINERS %{gopath}/src/%{import_path}/pkg/systemd/*.go +%dir %{gopath}/src/%{import_path}/pkg/tailfile +%{gopath}/src/%{import_path}/pkg/tailfile/*.go +%dir %{gopath}/src/%{import_path}/pkg/truncindex +%{gopath}/src/%{import_path}/pkg/truncindex/*.go %dir %{gopath}/src/%{import_path}/pkg/term %{gopath}/src/%{import_path}/pkg/term/MAINTAINERS %{gopath}/src/%{import_path}/pkg/term/*.go @@ -509,6 +444,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 +- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) + * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer diff --git a/docker.service b/docker.service index bb1a64a..9b6c614 100644 --- a/docker.service +++ b/docker.service @@ -1,16 +1,15 @@ [Unit] Description=Docker Application Container Engine -Documentation=http://docs.docker.io -After=network.target +Documentation=http://docs.docker.com +After=network.target docker.socket Requires=docker.socket [Service] Type=notify EnvironmentFile=-/etc/sysconfig/docker ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS -Restart=on-failure LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -WantedBy=multi-user.target +Also=docker.socket diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch index 061656a..2f766dd 100644 --- a/upstream-patched-archive-tar.patch +++ b/upstream-patched-archive-tar.patch @@ -1,6 +1,6 @@ -diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ---- docker-0.12.0/archive/archive.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive.go 2014-06-08 17:10:37.537530082 -0400 +diff -uNr docker-1.1.2/archive/archive.go docker-1.1.2-1/archive/archive.go +--- docker-1.1.2/archive/archive.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive.go 2014-07-25 10:47:31.042199877 -0500 @@ -18,7 +18,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -10,9 +10,9 @@ diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ) type ( -diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_test.go ---- docker-0.12.0/archive/archive_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive_test.go 2014-06-08 17:09:47.983603103 -0400 +diff -uNr docker-1.1.2/archive/archive_test.go docker-1.1.2-1/archive/archive_test.go +--- docker-1.1.2/archive/archive_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive_test.go 2014-07-25 10:46:52.199198162 -0500 @@ -11,7 +11,7 @@ "testing" "time" @@ -22,9 +22,9 @@ diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_ ) func TestCmdStreamLargeStderr(t *testing.T) { -diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ---- docker-0.12.0/archive/changes.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/changes.go 2014-06-08 17:10:27.932544229 -0400 +diff -uNr docker-1.1.2/archive/changes.go docker-1.1.2-1/archive/changes.go +--- docker-1.1.2/archive/changes.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/changes.go 2014-07-25 10:47:19.873199418 -0500 @@ -12,7 +12,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -34,9 +34,9 @@ diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ) type ChangeType int -diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ---- docker-0.12.0/archive/diff.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/diff.go 2014-06-08 17:10:20.248555556 -0400 +diff -uNr docker-1.1.2/archive/diff.go docker-1.1.2-1/archive/diff.go +--- docker-1.1.2/archive/diff.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/diff.go 2014-07-25 10:47:07.541198850 -0500 @@ -9,7 +9,7 @@ "strings" "syscall" @@ -46,9 +46,9 @@ diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ) // Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes. -diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go ---- docker-0.12.0/archive/wrap.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/wrap.go 2014-06-08 17:10:11.704568146 -0400 +diff -uNr docker-1.1.2/archive/wrap.go docker-1.1.2-1/archive/wrap.go +--- docker-1.1.2/archive/wrap.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/wrap.go 2014-07-25 10:46:59.077198483 -0500 @@ -2,7 +2,7 @@ import ( @@ -58,9 +58,9 @@ diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go "io/ioutil" ) -diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_test.go ---- docker-0.12.0/graph/tags_unit_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/graph/tags_unit_test.go 2014-06-08 17:10:48.989513208 -0400 +diff -uNr docker-1.1.2/graph/tags_unit_test.go docker-1.1.2-1/graph/tags_unit_test.go +--- docker-1.1.2/graph/tags_unit_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/graph/tags_unit_test.go 2014-07-25 10:47:40.758200323 -0500 @@ -6,7 +6,7 @@ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/image" @@ -70,33 +70,21 @@ diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_ "io" "os" "path" -diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_test.go ---- docker-0.12.0/integration/api_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/api_test.go 2014-06-08 17:10:58.148499687 -0400 -@@ -21,7 +21,7 @@ +diff -uNr docker-1.1.2/integration/api_test.go docker-1.1.2-1/integration/api_test.go +--- docker-1.1.2/integration/api_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/integration/api_test.go 2014-07-25 10:47:58.985201130 -0500 +@@ -18,7 +18,7 @@ + "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" ) - func TestGetEvents(t *testing.T) { -diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/utils_test.go ---- docker-0.12.0/integration/utils_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/utils_test.go 2014-06-08 17:11:10.725481190 -0400 -@@ -13,7 +13,7 @@ - "testing" - "time" - -- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" -+ "archive/tar" - - "github.com/dotcloud/docker/builtins" - "github.com/dotcloud/docker/daemon" -diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go ---- docker-0.12.0/utils/tarsum.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum.go 2014-06-08 17:11:19.678468002 -0400 + func TestGetImagesJSON(t *testing.T) { +diff -uNr docker-1.1.2/utils/tarsum.go docker-1.1.2-1/utils/tarsum.go +--- docker-1.1.2/utils/tarsum.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum.go 2014-07-25 10:49:00.034203856 -0500 @@ -5,7 +5,7 @@ "compress/gzip" "crypto/sha256" @@ -106,15 +94,15 @@ diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go "hash" "io" "sort" -diff -uNr docker-0.12.0/utils/tarsum_test.go docker-0.12.0-1/utils/tarsum_test.go ---- docker-0.12.0/utils/tarsum_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum_test.go 2014-06-08 17:11:43.703432620 -0400 -@@ -4,7 +4,7 @@ - "bytes" - "crypto/rand" - "fmt" +diff -uNr docker-1.1.2/utils/tarsum_test.go docker-1.1.2-1/utils/tarsum_test.go +--- docker-1.1.2/utils/tarsum_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum_test.go 2014-07-25 10:49:19.202204685 -0500 +@@ -9,7 +9,7 @@ + "os" + "testing" + - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" - "io" - "io/ioutil" - "os" + ) + + type testLayer struct {

1 0

[docker-io/f21] remove unused patches
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit ed1287518bfcfaaea1fb67bcb84b4cd20047b1e3 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:54:24 2014 -0500 remove unused patches finalize-namespace.patch | 64 ---------------------------------------------- sources | 2 +- 2 files changed, 1 insertions(+), 65 deletions(-) --- diff --git a/sources b/sources index 3ab3623..06b3414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c835295e1e0609affe9a3c7ec75d7240 v1.0.0.tar.gz +2e02d5288ecd6cbd9a6c3e4fd3b81ffc v1.1.2.tar.gz

1 0

[docker-io/f21] Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit fc1f88b97d68db9ff8d92fa814456465bfcc1ed9 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:49:08 2014 -0500 Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements docker-io.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 1209a87..ed31edd 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -445,7 +445,7 @@ exit 0 %changelog * Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 -- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) +- Resolves: rhbz#1124036 - update to upstream v1.1.2 * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer

1 0

[docker-io/f21] upgrade to 1.1.2
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit 8d06674757d985ad903cdf05fbc64dc69a22c724 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Jul 25 13:45:59 2014 -0500 upgrade to 1.1.2 docker-io.spec | 108 ++++++++---------------------------- docker.service | 7 +- upstream-patched-archive-tar.patch | 86 ++++++++++++---------------- 3 files changed, 63 insertions(+), 138 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index f37e502..1209a87 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -5,23 +5,22 @@ # so stripping the binaries breaks docker %global debug_package %{nil} -%global import_path github.com/dotcloud/docker -%global commit 63fe64c471e7d76be96a625350468dfc65c06c31 +%global import_path github.com/docker/docker +%global commit d84a070e476ce923dd03e28232564a87704613ab %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: docker-io -Version: 1.0.0 -Release: 10%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 Patch1: upstream-patched-archive-tar.patch -Patch2: finalize-namespace.patch # Resolves: rhbz#1119849 - add AUDIT_WRITE capablility -Patch3: audit-write.patch -URL: http://www.docker.io -# only x86_64 for now: https://github.com/dotcloud/docker/issues/136 +Patch2: audit-write.patch +URL: http://www.docker.com +# only x86_64 for now: https://github.com/docker/docker/issues/136 ExclusiveArch: x86_64 -Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz +Source0: https://github.com/docker/docker/archive/v%{version}.tar.gz Source1: docker.service Source2: docker.sysconfig Source3: docker.socket @@ -42,6 +41,8 @@ BuildRequires: golang(code.google.com/p/go.net/websocket) BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) # RHBZ#1109039 use syndtr/gocapability >= 0-0.7 BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/tchap/go-patricia/patricia) BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) @@ -154,7 +155,6 @@ Provides: golang(%{import_path}/pkg/user) = %{version}-%{release} Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} %description pkg-devel -This is the source libraries for docker. These source librariees are provided by docker, but are independent of docker specific logic. The import paths of %{import_path}/pkg/... @@ -162,8 +162,7 @@ The import paths of %{import_path}/pkg/... %setup -q -n docker-%{version} rm -rf vendor %patch1 -p1 -b upstream-patched-archive-tar -%patch2 -p1 -b finalize-namespace -%patch3 -p1 +%patch2 -p1 rm daemon/execdriver/native/template/*.go.orig %build @@ -176,7 +175,7 @@ export DOCKER_BUILDTAGS='selinux' export GOPATH=$(pwd)/_build:%{gopath} hack/make.sh dynbinary -contrib/man/md/md2man-all.sh +docs/man/md2man-all.sh cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax cp contrib/syntax/vim/README.md README-vim-syntax.md @@ -189,9 +188,9 @@ install -d %{buildroot}%{_libexecdir}/docker install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit # install manpage install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 contrib/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man5 -install -p -m 644 contrib/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 # install bash completion install -d %{buildroot}%{_sysconfdir}/bash_completion.d install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash @@ -240,7 +239,6 @@ exit 0 %systemd_postun_with_restart docker %files -%defattr(-,root,root,-) %doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md %doc LICENSE-vim-syntax README-vim-syntax.md %config(noreplace) %{_sysconfdir}/sysconfig/docker @@ -265,7 +263,6 @@ exit 0 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim %files devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/api %{gopath}/src/%{import_path}/api/MAINTAINERS @@ -273,6 +270,7 @@ exit 0 %{gopath}/src/%{import_path}/api/*.go %{gopath}/src/%{import_path}/api/client/*.go %dir %{gopath}/src/%{import_path}/api/server +%{gopath}/src/%{import_path}/api/server/MAINTAINERS %{gopath}/src/%{import_path}/api/server/*.go %dir %{gopath}/src/%{import_path}/archive %{gopath}/src/%{import_path}/archive/MAINTAINERS @@ -292,6 +290,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/lxc +%{gopath}/src/%{import_path}/daemon/execdriver/lxc/MAINTAINERS %{gopath}/src/%{import_path}/daemon/execdriver/lxc/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/native %{gopath}/src/%{import_path}/daemon/execdriver/native/*.go @@ -332,12 +331,6 @@ exit 0 %dir %{gopath}/src/%{import_path}/engine %{gopath}/src/%{import_path}/engine/MAINTAINERS %{gopath}/src/%{import_path}/engine/*.go -%dir %{gopath}/src/%{import_path}/engine/rengine -%{gopath}/src/%{import_path}/engine/rengine/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn -%{gopath}/src/%{import_path}/engine/spawn/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn/subengine -%{gopath}/src/%{import_path}/engine/spawn/subengine/*.go %dir %{gopath}/src/%{import_path}/graph %{gopath}/src/%{import_path}/graph/*.go %{gopath}/src/%{import_path}/graph/*.goupstream-patched-archive-tar @@ -374,73 +367,17 @@ exit 0 %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar %files pkg-devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/pkg %{gopath}/src/%{import_path}/pkg/README.md -%dir %{gopath}/src/%{import_path}/pkg/apparmor -%{gopath}/src/%{import_path}/pkg/apparmor/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam -%{gopath}/src/%{import_path}/pkg/beam/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/beam/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/data -%{gopath}/src/%{import_path}/pkg/beam/data/*.go -%{gopath}/src/%{import_path}/pkg/beam/data/netstring.txt -%dir %{gopath}/src/%{import_path}/pkg/beam/examples -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts/*.ds -%dir %{gopath}/src/%{import_path}/pkg/dockerscript -%{gopath}/src/%{import_path}/pkg/dockerscript/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/dockerscript/*.go -%dir %{gopath}/src/%{import_path}/pkg/dockerscript/scanner -%{gopath}/src/%{import_path}/pkg/dockerscript/scanner/*.go %dir %{gopath}/src/%{import_path}/pkg/graphdb %{gopath}/src/%{import_path}/pkg/graphdb/MAINTAINERS %{gopath}/src/%{import_path}/pkg/graphdb/*.go %dir %{gopath}/src/%{import_path}/pkg/iptables %{gopath}/src/%{import_path}/pkg/iptables/MAINTAINERS %{gopath}/src/%{import_path}/pkg/iptables/*.go -%dir %{gopath}/src/%{import_path}/pkg/label -%{gopath}/src/%{import_path}/pkg/label/*.go %dir %{gopath}/src/%{import_path}/pkg/listenbuffer %{gopath}/src/%{import_path}/pkg/listenbuffer/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer -%{gopath}/src/%{import_path}/pkg/libcontainer/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/libcontainer/README.md -%{gopath}/src/%{import_path}/pkg/libcontainer/TODO.md -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/console -%{gopath}/src/%{import_path}/pkg/libcontainer/console/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/container.json -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/devices -%{gopath}/src/%{import_path}/pkg/libcontainer/devices/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/namespaces -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/init.gofinalize-namespace -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/network -%{gopath}/src/%{import_path}/pkg/libcontainer/network/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/nsinit -%{gopath}/src/%{import_path}/pkg/libcontainer/nsinit/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities -%{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict -%{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/utils -%{gopath}/src/%{import_path}/pkg/libcontainer/utils/*.go %dir %{gopath}/src/%{import_path}/pkg/mflag %{gopath}/src/%{import_path}/pkg/mflag/LICENSE %{gopath}/src/%{import_path}/pkg/mflag/MAINTAINERS @@ -453,9 +390,6 @@ exit 0 %{gopath}/src/%{import_path}/pkg/mount/*.go %dir %{gopath}/src/%{import_path}/pkg/namesgenerator %{gopath}/src/%{import_path}/pkg/namesgenerator/*.go -%dir %{gopath}/src/%{import_path}/pkg/netlink -%{gopath}/src/%{import_path}/pkg/netlink/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/netlink/*.go %dir %{gopath}/src/%{import_path}/pkg/networkfs %{gopath}/src/%{import_path}/pkg/networkfs/MAINTAINERS %dir %{gopath}/src/%{import_path}/pkg/networkfs/etchosts @@ -465,10 +399,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/proxy %{gopath}/src/%{import_path}/pkg/proxy/MAINTAINERS %{gopath}/src/%{import_path}/pkg/proxy/*.go -%dir %{gopath}/src/%{import_path}/pkg/selinux -%{gopath}/src/%{import_path}/pkg/selinux/*.go %dir %{gopath}/src/%{import_path}/pkg/signal -%{gopath}/src/%{import_path}/pkg/signal/MAINTAINERS %{gopath}/src/%{import_path}/pkg/signal/*.go %dir %{gopath}/src/%{import_path}/pkg/symlink %{gopath}/src/%{import_path}/pkg/symlink/MAINTAINERS @@ -492,6 +423,10 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/systemd %{gopath}/src/%{import_path}/pkg/systemd/MAINTAINERS %{gopath}/src/%{import_path}/pkg/systemd/*.go +%dir %{gopath}/src/%{import_path}/pkg/tailfile +%{gopath}/src/%{import_path}/pkg/tailfile/*.go +%dir %{gopath}/src/%{import_path}/pkg/truncindex +%{gopath}/src/%{import_path}/pkg/truncindex/*.go %dir %{gopath}/src/%{import_path}/pkg/term %{gopath}/src/%{import_path}/pkg/term/MAINTAINERS %{gopath}/src/%{import_path}/pkg/term/*.go @@ -509,6 +444,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 +- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) + * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer diff --git a/docker.service b/docker.service index bb1a64a..9b6c614 100644 --- a/docker.service +++ b/docker.service @@ -1,16 +1,15 @@ [Unit] Description=Docker Application Container Engine -Documentation=http://docs.docker.io -After=network.target +Documentation=http://docs.docker.com +After=network.target docker.socket Requires=docker.socket [Service] Type=notify EnvironmentFile=-/etc/sysconfig/docker ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS -Restart=on-failure LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -WantedBy=multi-user.target +Also=docker.socket diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch index 061656a..2f766dd 100644 --- a/upstream-patched-archive-tar.patch +++ b/upstream-patched-archive-tar.patch @@ -1,6 +1,6 @@ -diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ---- docker-0.12.0/archive/archive.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive.go 2014-06-08 17:10:37.537530082 -0400 +diff -uNr docker-1.1.2/archive/archive.go docker-1.1.2-1/archive/archive.go +--- docker-1.1.2/archive/archive.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive.go 2014-07-25 10:47:31.042199877 -0500 @@ -18,7 +18,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -10,9 +10,9 @@ diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ) type ( -diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_test.go ---- docker-0.12.0/archive/archive_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive_test.go 2014-06-08 17:09:47.983603103 -0400 +diff -uNr docker-1.1.2/archive/archive_test.go docker-1.1.2-1/archive/archive_test.go +--- docker-1.1.2/archive/archive_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive_test.go 2014-07-25 10:46:52.199198162 -0500 @@ -11,7 +11,7 @@ "testing" "time" @@ -22,9 +22,9 @@ diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_ ) func TestCmdStreamLargeStderr(t *testing.T) { -diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ---- docker-0.12.0/archive/changes.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/changes.go 2014-06-08 17:10:27.932544229 -0400 +diff -uNr docker-1.1.2/archive/changes.go docker-1.1.2-1/archive/changes.go +--- docker-1.1.2/archive/changes.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/changes.go 2014-07-25 10:47:19.873199418 -0500 @@ -12,7 +12,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -34,9 +34,9 @@ diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ) type ChangeType int -diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ---- docker-0.12.0/archive/diff.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/diff.go 2014-06-08 17:10:20.248555556 -0400 +diff -uNr docker-1.1.2/archive/diff.go docker-1.1.2-1/archive/diff.go +--- docker-1.1.2/archive/diff.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/diff.go 2014-07-25 10:47:07.541198850 -0500 @@ -9,7 +9,7 @@ "strings" "syscall" @@ -46,9 +46,9 @@ diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ) // Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes. -diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go ---- docker-0.12.0/archive/wrap.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/wrap.go 2014-06-08 17:10:11.704568146 -0400 +diff -uNr docker-1.1.2/archive/wrap.go docker-1.1.2-1/archive/wrap.go +--- docker-1.1.2/archive/wrap.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/wrap.go 2014-07-25 10:46:59.077198483 -0500 @@ -2,7 +2,7 @@ import ( @@ -58,9 +58,9 @@ diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go "io/ioutil" ) -diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_test.go ---- docker-0.12.0/graph/tags_unit_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/graph/tags_unit_test.go 2014-06-08 17:10:48.989513208 -0400 +diff -uNr docker-1.1.2/graph/tags_unit_test.go docker-1.1.2-1/graph/tags_unit_test.go +--- docker-1.1.2/graph/tags_unit_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/graph/tags_unit_test.go 2014-07-25 10:47:40.758200323 -0500 @@ -6,7 +6,7 @@ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/image" @@ -70,33 +70,21 @@ diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_ "io" "os" "path" -diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_test.go ---- docker-0.12.0/integration/api_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/api_test.go 2014-06-08 17:10:58.148499687 -0400 -@@ -21,7 +21,7 @@ +diff -uNr docker-1.1.2/integration/api_test.go docker-1.1.2-1/integration/api_test.go +--- docker-1.1.2/integration/api_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/integration/api_test.go 2014-07-25 10:47:58.985201130 -0500 +@@ -18,7 +18,7 @@ + "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" ) - func TestGetEvents(t *testing.T) { -diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/utils_test.go ---- docker-0.12.0/integration/utils_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/utils_test.go 2014-06-08 17:11:10.725481190 -0400 -@@ -13,7 +13,7 @@ - "testing" - "time" - -- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" -+ "archive/tar" - - "github.com/dotcloud/docker/builtins" - "github.com/dotcloud/docker/daemon" -diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go ---- docker-0.12.0/utils/tarsum.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum.go 2014-06-08 17:11:19.678468002 -0400 + func TestGetImagesJSON(t *testing.T) { +diff -uNr docker-1.1.2/utils/tarsum.go docker-1.1.2-1/utils/tarsum.go +--- docker-1.1.2/utils/tarsum.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum.go 2014-07-25 10:49:00.034203856 -0500 @@ -5,7 +5,7 @@ "compress/gzip" "crypto/sha256" @@ -106,15 +94,15 @@ diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go "hash" "io" "sort" -diff -uNr docker-0.12.0/utils/tarsum_test.go docker-0.12.0-1/utils/tarsum_test.go ---- docker-0.12.0/utils/tarsum_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum_test.go 2014-06-08 17:11:43.703432620 -0400 -@@ -4,7 +4,7 @@ - "bytes" - "crypto/rand" - "fmt" +diff -uNr docker-1.1.2/utils/tarsum_test.go docker-1.1.2-1/utils/tarsum_test.go +--- docker-1.1.2/utils/tarsum_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum_test.go 2014-07-25 10:49:19.202204685 -0500 +@@ -9,7 +9,7 @@ + "os" + "testing" + - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" - "io" - "io/ioutil" - "os" + ) + + type testLayer struct {

1 0

[docker-io] remove unused patches
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit 98b5cbd2e14b80cce248fc546f0f951996ce71a1 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:54:24 2014 -0500 remove unused patches finalize-namespace.patch | 64 ---------------------------------------------- sources | 2 +- 2 files changed, 1 insertions(+), 65 deletions(-) --- diff --git a/sources b/sources index 3ab3623..06b3414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c835295e1e0609affe9a3c7ec75d7240 v1.0.0.tar.gz +2e02d5288ecd6cbd9a6c3e4fd3b81ffc v1.1.2.tar.gz

1 0

File v1.1.2.tar.gz uploaded to lookaside cache by lsm5
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

A file has been added to the lookaside cache for docker-io: 2e02d5288ecd6cbd9a6c3e4fd3b81ffc v1.1.2.tar.gz

1 0

[docker-io] Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit f87c5f9f4e89defc16069200893ae69c0417d68c Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Jul 31 22:49:08 2014 -0500 Resolves: rhbz#1124036 - update to v1.1.2, unitfile improvements docker-io.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 1209a87..ed31edd 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -445,7 +445,7 @@ exit 0 %changelog * Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 -- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) +- Resolves: rhbz#1124036 - update to upstream v1.1.2 * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer

1 0

[docker-io] upgrade to 1.1.2
by Lokesh Mandvekar 31 Jul '14

31 Jul '14

commit b0a50ab44d8fa3511941bceb307be9465cbed66d Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Fri Jul 25 13:45:59 2014 -0500 upgrade to 1.1.2 docker-io.spec | 108 ++++++++---------------------------- docker.service | 7 +- upstream-patched-archive-tar.patch | 86 ++++++++++++---------------- 3 files changed, 63 insertions(+), 138 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index f37e502..1209a87 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -5,23 +5,22 @@ # so stripping the binaries breaks docker %global debug_package %{nil} -%global import_path github.com/dotcloud/docker -%global commit 63fe64c471e7d76be96a625350468dfc65c06c31 +%global import_path github.com/docker/docker +%global commit d84a070e476ce923dd03e28232564a87704613ab %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: docker-io -Version: 1.0.0 -Release: 10%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 Patch1: upstream-patched-archive-tar.patch -Patch2: finalize-namespace.patch # Resolves: rhbz#1119849 - add AUDIT_WRITE capablility -Patch3: audit-write.patch -URL: http://www.docker.io -# only x86_64 for now: https://github.com/dotcloud/docker/issues/136 +Patch2: audit-write.patch +URL: http://www.docker.com +# only x86_64 for now: https://github.com/docker/docker/issues/136 ExclusiveArch: x86_64 -Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz +Source0: https://github.com/docker/docker/archive/v%{version}.tar.gz Source1: docker.service Source2: docker.sysconfig Source3: docker.socket @@ -42,6 +41,8 @@ BuildRequires: golang(code.google.com/p/go.net/websocket) BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) # RHBZ#1109039 use syndtr/gocapability >= 0-0.7 BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/tchap/go-patricia/patricia) BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) @@ -154,7 +155,6 @@ Provides: golang(%{import_path}/pkg/user) = %{version}-%{release} Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} %description pkg-devel -This is the source libraries for docker. These source librariees are provided by docker, but are independent of docker specific logic. The import paths of %{import_path}/pkg/... @@ -162,8 +162,7 @@ The import paths of %{import_path}/pkg/... %setup -q -n docker-%{version} rm -rf vendor %patch1 -p1 -b upstream-patched-archive-tar -%patch2 -p1 -b finalize-namespace -%patch3 -p1 +%patch2 -p1 rm daemon/execdriver/native/template/*.go.orig %build @@ -176,7 +175,7 @@ export DOCKER_BUILDTAGS='selinux' export GOPATH=$(pwd)/_build:%{gopath} hack/make.sh dynbinary -contrib/man/md/md2man-all.sh +docs/man/md2man-all.sh cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax cp contrib/syntax/vim/README.md README-vim-syntax.md @@ -189,9 +188,9 @@ install -d %{buildroot}%{_libexecdir}/docker install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit # install manpage install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 contrib/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man5 -install -p -m 644 contrib/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 # install bash completion install -d %{buildroot}%{_sysconfdir}/bash_completion.d install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash @@ -240,7 +239,6 @@ exit 0 %systemd_postun_with_restart docker %files -%defattr(-,root,root,-) %doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md %doc LICENSE-vim-syntax README-vim-syntax.md %config(noreplace) %{_sysconfdir}/sysconfig/docker @@ -265,7 +263,6 @@ exit 0 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim %files devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/api %{gopath}/src/%{import_path}/api/MAINTAINERS @@ -273,6 +270,7 @@ exit 0 %{gopath}/src/%{import_path}/api/*.go %{gopath}/src/%{import_path}/api/client/*.go %dir %{gopath}/src/%{import_path}/api/server +%{gopath}/src/%{import_path}/api/server/MAINTAINERS %{gopath}/src/%{import_path}/api/server/*.go %dir %{gopath}/src/%{import_path}/archive %{gopath}/src/%{import_path}/archive/MAINTAINERS @@ -292,6 +290,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/lxc +%{gopath}/src/%{import_path}/daemon/execdriver/lxc/MAINTAINERS %{gopath}/src/%{import_path}/daemon/execdriver/lxc/*.go %dir %{gopath}/src/%{import_path}/daemon/execdriver/native %{gopath}/src/%{import_path}/daemon/execdriver/native/*.go @@ -332,12 +331,6 @@ exit 0 %dir %{gopath}/src/%{import_path}/engine %{gopath}/src/%{import_path}/engine/MAINTAINERS %{gopath}/src/%{import_path}/engine/*.go -%dir %{gopath}/src/%{import_path}/engine/rengine -%{gopath}/src/%{import_path}/engine/rengine/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn -%{gopath}/src/%{import_path}/engine/spawn/*.go -%dir %{gopath}/src/%{import_path}/engine/spawn/subengine -%{gopath}/src/%{import_path}/engine/spawn/subengine/*.go %dir %{gopath}/src/%{import_path}/graph %{gopath}/src/%{import_path}/graph/*.go %{gopath}/src/%{import_path}/graph/*.goupstream-patched-archive-tar @@ -374,73 +367,17 @@ exit 0 %{gopath}/src/%{import_path}/utils/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar %files pkg-devel -%defattr(-,root,root,-) %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/pkg %{gopath}/src/%{import_path}/pkg/README.md -%dir %{gopath}/src/%{import_path}/pkg/apparmor -%{gopath}/src/%{import_path}/pkg/apparmor/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam -%{gopath}/src/%{import_path}/pkg/beam/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/beam/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/data -%{gopath}/src/%{import_path}/pkg/beam/data/*.go -%{gopath}/src/%{import_path}/pkg/beam/data/netstring.txt -%dir %{gopath}/src/%{import_path}/pkg/beam/examples -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/beamsh -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/*.go -%dir %{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts -%{gopath}/src/%{import_path}/pkg/beam/examples/beamsh/scripts/*.ds -%dir %{gopath}/src/%{import_path}/pkg/dockerscript -%{gopath}/src/%{import_path}/pkg/dockerscript/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/dockerscript/*.go -%dir %{gopath}/src/%{import_path}/pkg/dockerscript/scanner -%{gopath}/src/%{import_path}/pkg/dockerscript/scanner/*.go %dir %{gopath}/src/%{import_path}/pkg/graphdb %{gopath}/src/%{import_path}/pkg/graphdb/MAINTAINERS %{gopath}/src/%{import_path}/pkg/graphdb/*.go %dir %{gopath}/src/%{import_path}/pkg/iptables %{gopath}/src/%{import_path}/pkg/iptables/MAINTAINERS %{gopath}/src/%{import_path}/pkg/iptables/*.go -%dir %{gopath}/src/%{import_path}/pkg/label -%{gopath}/src/%{import_path}/pkg/label/*.go %dir %{gopath}/src/%{import_path}/pkg/listenbuffer %{gopath}/src/%{import_path}/pkg/listenbuffer/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer -%{gopath}/src/%{import_path}/pkg/libcontainer/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/libcontainer/README.md -%{gopath}/src/%{import_path}/pkg/libcontainer/TODO.md -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/fs/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd -%{gopath}/src/%{import_path}/pkg/libcontainer/cgroups/systemd/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/console -%{gopath}/src/%{import_path}/pkg/libcontainer/console/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/container.json -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/devices -%{gopath}/src/%{import_path}/pkg/libcontainer/devices/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes -%{gopath}/src/%{import_path}/pkg/libcontainer/mount/nodes/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/namespaces -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/*.go -%{gopath}/src/%{import_path}/pkg/libcontainer/namespaces/init.gofinalize-namespace -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/network -%{gopath}/src/%{import_path}/pkg/libcontainer/network/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/nsinit -%{gopath}/src/%{import_path}/pkg/libcontainer/nsinit/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities -%{gopath}/src/%{import_path}/pkg/libcontainer/security/capabilities/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict -%{gopath}/src/%{import_path}/pkg/libcontainer/security/restrict/*.go -%dir %{gopath}/src/%{import_path}/pkg/libcontainer/utils -%{gopath}/src/%{import_path}/pkg/libcontainer/utils/*.go %dir %{gopath}/src/%{import_path}/pkg/mflag %{gopath}/src/%{import_path}/pkg/mflag/LICENSE %{gopath}/src/%{import_path}/pkg/mflag/MAINTAINERS @@ -453,9 +390,6 @@ exit 0 %{gopath}/src/%{import_path}/pkg/mount/*.go %dir %{gopath}/src/%{import_path}/pkg/namesgenerator %{gopath}/src/%{import_path}/pkg/namesgenerator/*.go -%dir %{gopath}/src/%{import_path}/pkg/netlink -%{gopath}/src/%{import_path}/pkg/netlink/MAINTAINERS -%{gopath}/src/%{import_path}/pkg/netlink/*.go %dir %{gopath}/src/%{import_path}/pkg/networkfs %{gopath}/src/%{import_path}/pkg/networkfs/MAINTAINERS %dir %{gopath}/src/%{import_path}/pkg/networkfs/etchosts @@ -465,10 +399,7 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/proxy %{gopath}/src/%{import_path}/pkg/proxy/MAINTAINERS %{gopath}/src/%{import_path}/pkg/proxy/*.go -%dir %{gopath}/src/%{import_path}/pkg/selinux -%{gopath}/src/%{import_path}/pkg/selinux/*.go %dir %{gopath}/src/%{import_path}/pkg/signal -%{gopath}/src/%{import_path}/pkg/signal/MAINTAINERS %{gopath}/src/%{import_path}/pkg/signal/*.go %dir %{gopath}/src/%{import_path}/pkg/symlink %{gopath}/src/%{import_path}/pkg/symlink/MAINTAINERS @@ -492,6 +423,10 @@ exit 0 %dir %{gopath}/src/%{import_path}/pkg/systemd %{gopath}/src/%{import_path}/pkg/systemd/MAINTAINERS %{gopath}/src/%{import_path}/pkg/systemd/*.go +%dir %{gopath}/src/%{import_path}/pkg/tailfile +%{gopath}/src/%{import_path}/pkg/tailfile/*.go +%dir %{gopath}/src/%{import_path}/pkg/truncindex +%{gopath}/src/%{import_path}/pkg/truncindex/*.go %dir %{gopath}/src/%{import_path}/pkg/term %{gopath}/src/%{import_path}/pkg/term/MAINTAINERS %{gopath}/src/%{import_path}/pkg/term/*.go @@ -509,6 +444,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Thu Jul 31 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-1 +- update to upstream v1.1.2 (d84a070e476ce923dd03e28232564a87704613ab) + * Mon Jul 28 2014 Vincent Batts <vbatts(a)fedoraproject.org> - 1.0.0-10 - split out the %{import_path}/pkg/... libraries, to avoid cyclic deps with libcontainer diff --git a/docker.service b/docker.service index bb1a64a..9b6c614 100644 --- a/docker.service +++ b/docker.service @@ -1,16 +1,15 @@ [Unit] Description=Docker Application Container Engine -Documentation=http://docs.docker.io -After=network.target +Documentation=http://docs.docker.com +After=network.target docker.socket Requires=docker.socket [Service] Type=notify EnvironmentFile=-/etc/sysconfig/docker ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS -Restart=on-failure LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -WantedBy=multi-user.target +Also=docker.socket diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch index 061656a..2f766dd 100644 --- a/upstream-patched-archive-tar.patch +++ b/upstream-patched-archive-tar.patch @@ -1,6 +1,6 @@ -diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ---- docker-0.12.0/archive/archive.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive.go 2014-06-08 17:10:37.537530082 -0400 +diff -uNr docker-1.1.2/archive/archive.go docker-1.1.2-1/archive/archive.go +--- docker-1.1.2/archive/archive.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive.go 2014-07-25 10:47:31.042199877 -0500 @@ -18,7 +18,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -10,9 +10,9 @@ diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go ) type ( -diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_test.go ---- docker-0.12.0/archive/archive_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/archive_test.go 2014-06-08 17:09:47.983603103 -0400 +diff -uNr docker-1.1.2/archive/archive_test.go docker-1.1.2-1/archive/archive_test.go +--- docker-1.1.2/archive/archive_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/archive_test.go 2014-07-25 10:46:52.199198162 -0500 @@ -11,7 +11,7 @@ "testing" "time" @@ -22,9 +22,9 @@ diff -uNr docker-0.12.0/archive/archive_test.go docker-0.12.0-1/archive/archive_ ) func TestCmdStreamLargeStderr(t *testing.T) { -diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ---- docker-0.12.0/archive/changes.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/changes.go 2014-06-08 17:10:27.932544229 -0400 +diff -uNr docker-1.1.2/archive/changes.go docker-1.1.2-1/archive/changes.go +--- docker-1.1.2/archive/changes.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/changes.go 2014-07-25 10:47:19.873199418 -0500 @@ -12,7 +12,7 @@ "github.com/dotcloud/docker/pkg/system" @@ -34,9 +34,9 @@ diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go ) type ChangeType int -diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ---- docker-0.12.0/archive/diff.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/diff.go 2014-06-08 17:10:20.248555556 -0400 +diff -uNr docker-1.1.2/archive/diff.go docker-1.1.2-1/archive/diff.go +--- docker-1.1.2/archive/diff.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/diff.go 2014-07-25 10:47:07.541198850 -0500 @@ -9,7 +9,7 @@ "strings" "syscall" @@ -46,9 +46,9 @@ diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go ) // Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes. -diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go ---- docker-0.12.0/archive/wrap.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/archive/wrap.go 2014-06-08 17:10:11.704568146 -0400 +diff -uNr docker-1.1.2/archive/wrap.go docker-1.1.2-1/archive/wrap.go +--- docker-1.1.2/archive/wrap.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/archive/wrap.go 2014-07-25 10:46:59.077198483 -0500 @@ -2,7 +2,7 @@ import ( @@ -58,9 +58,9 @@ diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go "io/ioutil" ) -diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_test.go ---- docker-0.12.0/graph/tags_unit_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/graph/tags_unit_test.go 2014-06-08 17:10:48.989513208 -0400 +diff -uNr docker-1.1.2/graph/tags_unit_test.go docker-1.1.2-1/graph/tags_unit_test.go +--- docker-1.1.2/graph/tags_unit_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/graph/tags_unit_test.go 2014-07-25 10:47:40.758200323 -0500 @@ -6,7 +6,7 @@ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/dotcloud/docker/image" @@ -70,33 +70,21 @@ diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_ "io" "os" "path" -diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_test.go ---- docker-0.12.0/integration/api_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/api_test.go 2014-06-08 17:10:58.148499687 -0400 -@@ -21,7 +21,7 @@ +diff -uNr docker-1.1.2/integration/api_test.go docker-1.1.2-1/integration/api_test.go +--- docker-1.1.2/integration/api_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/integration/api_test.go 2014-07-25 10:47:58.985201130 -0500 +@@ -18,7 +18,7 @@ + "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" ) - func TestGetEvents(t *testing.T) { -diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/utils_test.go ---- docker-0.12.0/integration/utils_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/integration/utils_test.go 2014-06-08 17:11:10.725481190 -0400 -@@ -13,7 +13,7 @@ - "testing" - "time" - -- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" -+ "archive/tar" - - "github.com/dotcloud/docker/builtins" - "github.com/dotcloud/docker/daemon" -diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go ---- docker-0.12.0/utils/tarsum.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum.go 2014-06-08 17:11:19.678468002 -0400 + func TestGetImagesJSON(t *testing.T) { +diff -uNr docker-1.1.2/utils/tarsum.go docker-1.1.2-1/utils/tarsum.go +--- docker-1.1.2/utils/tarsum.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum.go 2014-07-25 10:49:00.034203856 -0500 @@ -5,7 +5,7 @@ "compress/gzip" "crypto/sha256" @@ -106,15 +94,15 @@ diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go "hash" "io" "sort" -diff -uNr docker-0.12.0/utils/tarsum_test.go docker-0.12.0-1/utils/tarsum_test.go ---- docker-0.12.0/utils/tarsum_test.go 2014-06-05 20:59:19.000000000 -0400 -+++ docker-0.12.0-1/utils/tarsum_test.go 2014-06-08 17:11:43.703432620 -0400 -@@ -4,7 +4,7 @@ - "bytes" - "crypto/rand" - "fmt" +diff -uNr docker-1.1.2/utils/tarsum_test.go docker-1.1.2-1/utils/tarsum_test.go +--- docker-1.1.2/utils/tarsum_test.go 2014-07-22 19:29:56.000000000 -0500 ++++ docker-1.1.2-1/utils/tarsum_test.go 2014-07-25 10:49:19.202204685 -0500 +@@ -9,7 +9,7 @@ + "os" + "testing" + - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/…" + "archive/tar" - "io" - "io/ioutil" - "os" + ) + + type testLayer struct {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang August 2014