Commit Graph

6282 Commits

Author SHA1 Message Date
5656d23221 Fix attach exit on darwin
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 95e5910ab23e3ef7b0154f64e1c6ae01bc647ab3
Component: engine
2014-03-11 17:51:29 -07:00
b4ecbb8459 Merge pull request #4521 from tianon/release-checklist-origin
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
Upstream-commit: 7b79f597f6b8e4985f78e5a6b78e5d6d1e6779dc
Component: engine
2014-03-11 14:34:47 -06:00
d1752e453e Merge pull request #4504 from alexlarsson/devicemapper-waits
devmapper: Increase sleep times and unlock while sleeping
Upstream-commit: b55a79aa1cfedd981653f0e46bb0a8a73ccc6796
Component: engine
2014-03-11 13:17:53 -07:00
45bf14b1a8 Merge pull request #4491 from crosbymichael/add-pull-dep
Add deprecation warning for -t on pull
Upstream-commit: 3715f46b8bfeb4a5127e03c1a7b2beaf6a3cc341
Component: engine
2014-03-11 10:22:06 -07:00
27ee8116cc Merge pull request #4589 from creack/update_maintainer
Update MAINTAINER email + add self to pkg/signal MAINTAINER
Upstream-commit: 0a6d9035cf37e567e4573fce5ac4b192c21abf47
Component: engine
2014-03-11 10:18:37 -07:00
d3002d9f6e Merge pull request #4466 from alexlarsson/execdrivers
Move execdriver construction into execdriver/execdrivers
Upstream-commit: 7654bac4427f589a3b1b7ad18307ccd0b8479f8c
Component: engine
2014-03-11 10:14:20 -07:00
3d1071683c Add deprecation warning for -t on pull
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 15e52ccaadea996b409e2f62bcbdb1a088619e35
Component: engine
2014-03-11 10:11:05 -07:00
7dd068d585 Merge pull request #4499 from alexlarsson/fix-remove-fail
DeviceMapper: Succeed immediately when removing non-existant devices
Upstream-commit: af3ff044a2daaf00f50e17a244a5172b69a86a8e
Component: engine
2014-03-11 10:09:58 -07:00
c344e2f4a8 Merge pull request #4569 from dolph/master
spelling correction
Upstream-commit: 6169dafab3e3e1b582476177be2afd29704f5e57
Component: engine
2014-03-11 09:19:46 -07:00
b9ed459d1e Merge pull request #4583 from kzys/freebsd-signal
Like signal_linux.go, we don't have import os and os/signal
Upstream-commit: 037f942a0b37cc79f42fc26cfdd9f665f075f099
Component: engine
2014-03-11 09:01:39 -07:00
57e56c8558 Move execdriver construction into execdriver/execdrivers
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 07c35b41a5a93f31111d47afcb1e6d2926b492a0
Component: engine
2014-03-11 16:37:19 +01:00
ed3716396b Like signal_linux.go, we don't have import os and os/signal
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: b2cd89056f5c49746ee668946ce4e1771f3ce368
Component: engine
2014-03-11 23:14:58 +09:00
01cbab9363 add Net::Docker CPAN module
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b348ee0fd0e4f8d2cb453a08f2b0d174550a339d
Component: engine
2014-03-11 20:28:26 +10:00
84def4f523 Update email + add self to pkg/signal
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 915d967f556bc7bb3faea34db8a06ea64fd5de92
Component: engine
2014-03-10 20:26:45 -07:00
85cc4fc5d5 spelling correction
s/singal/signal/

Docker-DCO-1.1-Signed-off-by: Dolph Mathews <dolph.mathews@gmail.com> (github: dolph)
Upstream-commit: 18ea183ea0abd18cde0d17e57fc0fa9b19cfab08
Component: engine
2014-03-10 22:17:03 -05:00
11f1b48016 Merge pull request #4563 from creack/signal-improvment
Signal improvments
Upstream-commit: b5a544b02e2d6f5e880064f327bcb1d5d866e30e
Component: engine
2014-03-10 17:59:17 -07:00
12154734b4 Merge pull request #4520 from tianon/clarify-docs-branch-update
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
Upstream-commit: ce091717809d05a00b37c2fe8a20dff0f2d9a5ad
Component: engine
2014-03-10 18:47:31 -06:00
4189aa7e42 Merge pull request #4567 from creack/merge_auth_registry
Merge auth package within registry
Upstream-commit: 7fc4cc0759469274715e36b2a77fb04a6919a431
Component: engine
2014-03-10 17:45:56 -07:00
6afe06b48d Merge pull request #4515 from vieux/improve_sort_flags
improve alpha sort in mflag
Upstream-commit: 923962a4b5e8787449ff247400f0b30b4b04835d
Component: engine
2014-03-10 17:45:41 -07:00
9db05a87c8 Make docker use the signal pkg with strings
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 157f24ca77a38f7c5c2b22322a2a353d5098a21e
Component: engine
2014-03-10 17:36:47 -07:00
9d9d39b644 Create portable signalMap
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 10dc16dcd3aa82be256e5072a25dcf18af8e3844
Component: engine
2014-03-10 17:36:41 -07:00
357d278b81 Move signal to pkg
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: c5632622391921160687f3e0155bdfe3d3cfc07d
Component: engine
2014-03-10 17:36:32 -07:00
6c11019545 Merge pull request #4566 from srid/nsinit_uniq_errors
nsinit: prefix errors with their source
Upstream-commit: 0b8cd3ec8eb35f8b196ce841432563f3282297c7
Component: engine
2014-03-10 17:26:17 -07:00
4fcd3ec7b6 Merge auth package within registry
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 8d88ea0c15b7ce7fd2b0b695c498a7ffa0f2bc87
Component: engine
2014-03-10 17:16:58 -07:00
8f3c1c1399 nsinit: prefix errors with their source
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
Upstream-commit: 03211ecce07ab64f5263232e1aa3c6248530c5b4
Component: engine
2014-03-10 17:08:50 -07:00
9e8481540f Merge pull request #4564 from vieux/remove_unused_version
Remove unused version.go
Upstream-commit: bc513c5afb052c6a7e63436c4848b0a40f301bc7
Component: engine
2014-03-10 17:06:30 -07:00
193c19b4a6 Merge pull request #4440 from infoxchange/aufs-permissions-4068
Create directories for tar files with relaxed permissions
Upstream-commit: ca3369dc8d5032e29452b354f1bcc9e10e39b917
Component: engine
2014-03-10 16:50:17 -07:00
9ff573ff6e Merge pull request #3985 from creack/add_freebsd_support
Add freebsd client support
Upstream-commit: 8bcb156694152d90698c3a0cb7b9cf539a838f8e
Component: engine
2014-03-11 00:58:30 +02:00
8dec75ff8f Update vendor.sh with new kr/pty revision
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3c25302a0b9fae2c3fff9262b2ae9fa5f6f04db7
Component: engine
2014-03-10 15:34:38 -07:00
519289ece2 Update bsd specs
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 6ccfb7fb9af207a9999c60e57d1c9486ca949a5e
Component: engine
2014-03-10 15:19:08 -07:00
3c355e4136 Update vendor for kr/pty
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 802407a099705a91017fbaa1b6820f145f580d86
Component: engine
2014-03-10 15:18:54 -07:00
12169c39c1 remove useless lock
move job to server and remove version.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 6f70ed3a742162c4cf374a2c2bbd094eed3b043b
Component: engine
2014-03-10 22:14:37 +00:00
e67ec53367 Merge pull request #4562 from vieux/remove_utils_in_docker_package
Remove utils in docker package
Upstream-commit: 3c7206b9910935dcc4225b89e27ddc68da684f83
Component: engine
2014-03-10 14:27:13 -07:00
5bd0f32f99 move opts out of pkg because it's related to docker
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fde5f573d39020476c08ed25fac0a6306f7b18cc
Component: engine
2014-03-10 21:10:23 +00:00
36711e609f Change version to v0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d7646f934a268bf071a16439880ba2bba608426e
Component: engine
2014-03-10 14:08:26 -07:00
0bf2ef6cc5 Merge branch 'release' into merge_release_v0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 71c65193e0d881acea37b2133e3f9ce31b4be938
Component: engine
2014-03-10 14:08:17 -07:00
6a607918e7 remove utils.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d648708d02134c3dc6788ad21325224d849b3b8f
Component: engine
2014-03-10 21:06:27 +00:00
1023142a13 Merge pull request #4538 from crosbymichael/move-runtime
Move runtime into sub package
Upstream-commit: 52c258c5cf6bf21074d1f27f6be583ae028cbf0a
Component: engine
2014-03-10 22:52:32 +02:00
7fa0504247 Merge pull request #4542 from fabiofalci/remove_manual_cookie
Remove manual http cookie management
Upstream-commit: 4fa8d0794e1abd596650dd08a5667bb6946e8ea4
Component: engine
2014-03-10 13:51:02 -07:00
ead774a13b move a unit test file
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0ebf5d0ab3a3999a7e2efe619ef194ff3817e3a3
Component: engine
2014-03-10 20:24:15 +00:00
66069773bc Merge branch 'master' into add_freebsd_support
Conflicts:
	archive/archive.go
	archive/start_unsupported.go
Upstream-commit: bb43761940848650c1eab3c097d826892bd5b140
Component: engine
2014-03-10 13:20:49 -07:00
378360f31e Removing myself from doc maintainers due to other obligations eliminating time to maintain docs.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 3e4d0857bf560296801e68b1b218654954c952e9
Component: engine
2014-03-10 12:55:26 -07:00
567ae542b1 Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
Upstream-commit: 2b3fdf2344fee3affc44c93a034ce894af4d6193
Component: engine
2014-03-10 09:57:10 -07:00
a185dfcddd Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 50082f792be22b97dcc79afe666289ecefbc3864
Component: engine
2014-03-10 03:27:46 -06:00
0d48ade882 Add IsRunning to server interface
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 47edf3e8bf759270c243711eaed1faa1d4d61f35
Component: engine
2014-03-09 23:16:15 -07:00
060a86aead Move runtime and container into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 36c3614fdde079fad178390f651945fba884668a
Component: engine
2014-03-09 23:03:40 -07:00
a67c5c76aa Move graph and tags to graph sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 01b6b2be73a6f40e0179e0217385eea6b41100a5
Component: engine
2014-03-09 22:59:29 -07:00
fc0f37e6e1 Move image into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82a5439835b0bff3ab3dfb169415948dae504d56
Component: engine
2014-03-09 22:59:29 -07:00
a25b16df9e Move daemon config into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 12bd83182dff24a800eee6e7e93beeab30b480b7
Component: engine
2014-03-09 22:59:28 -07:00
7ed3338517 Remove manual http cookie management
Since docker uses cookiejar it doesn't need to manage cookies manually
anymore.
Managing cookie was duplicating it.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: df9b99aca0b8a65da866aa5696b9f45df3b92e50
Component: engine
2014-03-09 02:25:19 +00:00