toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Bialas 72bafe062f added re-directs for cloud install docs as clean-up for #18282 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 2ffb362f9bbfea5ac72ebe11c5692f129eb8ccd2
Component: engine
 2016-01-07 16:06:46 -08:00
Victoria Bialas ac71b2f7e1 fixed links in Digital Ocean example 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 3ff20fafccdce09428171511982305a180dc9928
Component: engine
 2015-12-23 16:31:49 -08:00
Carol Fager-Higgins e2a6738cd5 fixed jira DTR-1173 typo in link and additional edits 
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
 2015-09-23 12:33:45 -07:00
Alvin Richards e1c50ccb66 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
Upstream-commit: 3f37afe0b98919b91bffb0f90abe2d25a5ead989
Component: engine
 2015-05-18 13:08:31 -07:00
John Willis 6446908d00 #11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md 
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: 2c07fd9fdf78842b4a09ff9a226bd57ba500f16b
Component: engine
 2015-03-26 16:09:56 -04:00
John Willis c0b33db0e0 #11465 Add additional doc for locagi registries onn pull command 
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: 3d28fc7d1c92456b226e1169bf3f44dcd9154b71
Component: engine
 2015-03-23 21:00:02 -04:00
Andrew Weiss 012e97ea38 updated article to reflect changes in config; fixed hyperlinks #7243 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
Upstream-commit: 7a5db6df995a131579020fd2cbacd49cb82e0aea
Component: engine
 2014-07-25 15:49:33 -04:00
Andrew Weiss 84b509b855 add DSC article 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
Upstream-commit: 5c344dca4be275fc4e85c5e2dfd35133aff5cb23
Component: engine
 2014-07-01 17:32:55 -04:00
Guillaume J. Charmes 7f0603ffdf Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount 
now busybox as nc
Upstream-commit: baed5d74339407fcc04277d264aa31a995719c75
Component: engine
 2014-05-23 14:48:24 -07:00
Guillaume J. Charmes 9c8b2dfbeb Remove the mtime for temp file. Prevent false negative cache 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bcfe2ceffb1c4c7006570d4ba21ed2068bb448a1
Component: engine
 2014-05-20 21:31:28 +00:00
Guillaume J. Charmes cd508fe398 Merge pull request #5915 from vieux/start_remove_link 
starts by removing the name from the graph db
Upstream-commit: b5d0bdc9e8f651848b1be2347cedc894dd470e64
Component: engine
 2014-05-19 14:38:55 -07:00
Guillaume J. Charmes 062e6435f7 Merge pull request #5913 from crosbymichael/fuse 
Make sure dev/fuse is created in container
Upstream-commit: 2d1c2456313d66f3f0ac42d4dc2d307c0fc457c3
Component: engine
 2014-05-19 14:31:32 -07:00
Guillaume J. Charmes 25d692e3fa Merge pull request #5911 from LK4D4/chmod_on_add_#3979 
Make chmod on ADDed files
Upstream-commit: 5fee3774d4c68fa6ec1e330575b1f6edfb71dc6f
Component: engine
 2014-05-19 13:35:55 -07:00
Guillaume J. Charmes 4d36898842 Merge pull request #5851 from proppy/archive-simple-detect 
archive: simplify DetectCompression
Upstream-commit: 6f651ec62bdb7b00dc286414c1807a4ae4216058
Component: engine
 2014-05-16 16:32:55 -07:00
Guillaume J. Charmes e6ed9607f5 Merge pull request #5454 from kzys/utime-omit 
UTIME_OMIT is only available on Linux
Upstream-commit: 4353ee78e8614779012b2f24d79a46fa352739b8
Component: engine
 2014-05-15 17:18:37 -07:00
Guillaume J. Charmes a00e014556 Merge pull request #5823 from proppy/archive-bufio 
archive: use bufio for compression detection
Upstream-commit: 924aa984cf9ded2b49ccc9079ce69c96b3d64041
Component: engine
 2014-05-15 16:08:21 -07:00
Guillaume J. Charmes 30441260af Add test for invalid tarball read 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: aedcb76adc2b2468565b311b67f4079a128b37cd
Component: engine
 2014-05-15 15:45:40 -07:00
Guillaume J. Charmes f5e7688aff Update archive/tar vendored 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 094926206bc98718f2eac95849e57439155d7c6c
Component: engine
 2014-05-15 15:40:26 -07:00
Guillaume J. Charmes 1394048dd1 Merge pull request #5783 from LK4D4/fix_duplicate_ip_allocation_#5729 
Fix duplicate ip allocation
Upstream-commit: 17a1f470ae3e6f1d7a7c4545983e37bfcfe981ab
Component: engine
 2014-05-14 13:32:27 -07:00
Guillaume J. Charmes 435045ce97 Remove the bind mount for dev/console which override the mknod/label 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: ae85dd54582e94d36b146ab1688844ed58cc8df3
Component: engine
 2014-05-13 11:59:27 -07:00
Guillaume J. Charmes 6db71da5ab Merge pull request #5751 from vieux/move_version 
move version out of server
Upstream-commit: 0d78799db779d867eb8e8d264405a8be21df70ee
Component: engine
 2014-05-12 15:25:40 -07:00
Guillaume J. Charmes d5efcab5ae Merge pull request #5717 from philips/mkdir-in-daemon 
fix(daemon): ensure the /var/lib/docker dir exists
Upstream-commit: bc77ec2b17b6822a5a930cc34ae0d8a32bffc253
Component: engine
 2014-05-12 14:13:56 -07:00
Guillaume J. Charmes c178af9458 Use int64 instead of int 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 62bfef59f7ae6f9128bfc3e7ef2e6ed5e4441d2e
Component: engine
 2014-05-11 06:23:53 -07:00
Guillaume J. Charmes 4b636334e3 Remove signal_freebsd (already in pkg/signal) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3f8ffb461ab66535b3c3a96a564c06db12a27281
Component: engine
 2014-05-11 01:03:12 -07:00
Guillaume J. Charmes 4e4fbfd51e Merge pull request #5667 from bitness/typo-fix 
Fix error name typo (ErrInvalidWorikingDirectory)
Upstream-commit: ed00ba84acfaefe9d2dd67dd5b186842990e049a
Component: engine
 2014-05-07 16:53:08 -07:00
Guillaume J. Charmes b0da971da8 Merge pull request #5665 from vieux/fix_auth_issue 
Fix auth issue
Upstream-commit: c7712b350a51a2727c170d89b3e7ecc7cf70c90d
Component: engine
 2014-05-07 16:36:07 -07:00
Guillaume J. Charmes 5b021e4d5b Merge pull request #5601 from crosbymichael/alex-maintainer 
Add alex as devmapper and btrfs maintainer
Upstream-commit: 839b06b121800a9b222fe673ab54cdad918ba883
Component: engine
 2014-05-05 17:10:05 -07:00
Guillaume J. Charmes 98de875d78 Merge pull request #5614 from crosbymichael/move-attach-to-daemon 
Move Attach from container to daemon
Upstream-commit: affacfab08281e7d9bbd7c0d83bc0a842cb764aa
Component: engine
 2014-05-05 16:56:11 -07:00
Guillaume J. Charmes dfb1a0bff0 Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes 
cgroups: Update systemd to match fs backend
Upstream-commit: 0b15944cb047e6467f399ebf5c3f93262fe4c06f
Component: engine
 2014-05-05 16:00:56 -07:00
Guillaume J. Charmes d5f89ec02b Merge pull request #4441 from crosbymichael/add-net-flag 
Add --net flag to docker run and allow host network stack
Upstream-commit: 70fef1460a9d253bdf164d70d7057ec4ee497e08
Component: engine
 2014-05-05 13:54:55 -07:00
Guillaume J. Charmes b560ddbfed Merge pull request #5496 from unclejack/check_if_root 
check if the daemon is run as root on startup
Upstream-commit: 5f301191cfd16d6898514112658e91eaaff238b3
Component: engine
 2014-05-05 10:13:17 -07:00
Guillaume J. Charmes f993f95731 Merge pull request #5560 from gabrtv/deregister-containers-earlier 
De-register containers before removing driver and containerGraph references
Upstream-commit: 103d02813238c2bb8c91625401427716f5bf988f
Component: engine
 2014-05-02 15:20:51 -07:00
Guillaume J. Charmes 397faaf38a Remove unused daemon/sorter.go 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 8913ec4912e529be44b7cc2aaf465b0d9b03ffc9
Component: engine
 2014-05-02 14:16:05 -07:00
Guillaume J. Charmes ac76593583 Month devpts before mounting subdirs 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: a7ccbfd5f143af8a7accc69803b1588e568328ac
Component: engine
 2014-05-02 13:55:45 -07:00
Guillaume J. Charmes 4d667fa77e Merge pull request #5529 from crosbymichael/restrict-proc 
Mount /proc and /sys read-only, except in privileged containers
Upstream-commit: 1c5a3123cc6ac396656b1027504748bd8dcd65e9
Component: engine
 2014-05-02 10:52:53 -07:00
Guillaume J. Charmes ec54d1dc2d Merge pull request #5515 from crosbymichael/refactor-libcontainer2 
Remove CommandFactory and NsInit interface
Upstream-commit: fe4a25546a434eb0299bdc7f61a3cfcc3752fb33
Component: engine
 2014-05-01 11:41:54 -07:00
Guillaume J. Charmes effc835e97 Merge pull request #5092 from LK4D4/timestamp_for_docker_logs_#1165 
Timestamps for docker logs.
Upstream-commit: c42db412b69be4f81319561e20923cf786c84a5d
Component: engine
 2014-05-01 10:32:34 -07:00
Guillaume J. Charmes 3c350a7bfd Merge pull request #5511 from crosbymichael/refactor-libcontainer 
Refactor: remove statewriter type and all callback for process start
Upstream-commit: 26ac05c8bce47fd37c35e43b98cdbcfb65a5c9bb
Component: engine
 2014-04-30 16:50:57 -07:00
Guillaume J. Charmes 47e64912c0 Merge pull request #5512 from crosbymichael/set-freezer 
Add ability to set cgroups freezer
Upstream-commit: be013c7820747af5e3696ad306b817aa437dd3c4
Component: engine
 2014-04-30 16:50:01 -07:00
Guillaume J. Charmes 87fcb82bfa Merge pull request #5448 from crosbymichael/selinux-defaults 
Add selinux label support for processes and mount
Upstream-commit: 2a711d16e05b69328f2636f88f8eac035477f7e4
Component: engine
 2014-04-30 14:14:39 -07:00
Guillaume J. Charmes 4478918ea3 Merge pull request #5460 from tianon/no-pull-scratch 
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Upstream-commit: 2c85468753509c442a675d79de0e65476468c453
Component: engine
 2014-04-29 14:37:06 -07:00
Guillaume J. Charmes fc27b99e17 Merge pull request #5373 from vmarmol/master 
Separating cgroup Memory and MemoryReservation.
Upstream-commit: 85540f6aa0c742c1623025b1fb235d7fd29cd9c7
Component: engine
 2014-04-24 14:28:40 -07:00
Guillaume J. Charmes 8b8d39c95a Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create 
devicemapper: Don't mount in Create()
Upstream-commit: 56b779c32154327c2939a2e653fda3623b6f63b4
Component: engine
 2014-04-24 08:19:59 -07:00
Guillaume J. Charmes 415365ba93 Merge pull request #5347 from crosbymichael/engine-root 
Remove root dir from engine
Upstream-commit: baf6cf90561a1582683c92dd209e36f78a39288e
Component: engine
 2014-04-23 13:53:08 -07:00
Guillaume J. Charmes 771ba80867 Merge pull request #5331 from shykes/cleanup-maintainers 
Clean up MAINTAINERS files
Upstream-commit: e630d9ea245be9c706d904edb56aebed1d5d0581
Component: engine
 2014-04-21 18:18:39 -07:00
Guillaume J. Charmes e178abd17a Merge pull request #5328 from crosbymichael/refactor-cgroups 
Refactor cgroups into subsystems and support metrics
Upstream-commit: 781671245778c8cfdde1892204bb10899020b0d8
Component: engine
 2014-04-21 14:06:17 -07:00
Guillaume J. Charmes 27e5f687ba Merge pull request #5232 from kzys/freebsd-graph 
Fix graph and pkg/graphdb on FreeBSD
Upstream-commit: 3c50cb44d186ccaf9edc85cad0f91917516ff07c
Component: engine
 2014-04-21 10:39:50 -07:00
Guillaume J. Charmes 1ea14534fa Merge branch 'master' into load-profile 
Conflicts:
	daemon/execdriver/native/create.go
	daemon/execdriver/native/driver.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 813cebc64fb4b628e2938405d86144060c330eb9
Component: engine
 2014-04-21 10:32:13 -07:00
Guillaume J. Charmes eec18ea747 Make sure @proc is defined 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: ac814ee3c76a3851d361e8dddfed7ac93ddf10e2
Component: engine
 2014-04-21 10:28:04 -07:00
Guillaume J. Charmes c35b2bba93 Add integration test for hairpin nat 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 1775ed8c75fabb3544402ca13afe7a4c35b27038
Component: engine
 2014-04-16 14:50:11 -07:00
Guillaume J. Charmes 2355a3647b Merge pull request #5158 from vieux/refactor_build_only_configFile 
refactor build job to know only configFile
Upstream-commit: e5ad715e5964bc64e098070d1ca72b110c337d1a
Component: engine
 2014-04-14 10:59:48 -07:00
Guillaume J. Charmes feaba75b7b Merge pull request #5075 from tianon/update-check-config 
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Upstream-commit: 19ffc5e92f5ddfc197890b0bc6a51187d0fd1916
Component: engine
 2014-04-14 10:58:00 -07:00
Guillaume J. Charmes 156fab79f3 Merge pull request #4878 from kzys/freebsd-utimes 
Support FreeBSD on pkg/system/utimes_*.go
Upstream-commit: f98ed28c1dd5766cb8c80f32418f13878df29e6c
Component: engine
 2014-04-14 10:39:25 -07:00
Guillaume J. Charmes 98f471928f Merge pull request #5069 from tianon/hack-make-ubuntu-man 
Add contrib/man to our generated deb
Upstream-commit: 7dd9c208fdb4ea3083783437843ea27c7c8a077b
Component: engine
 2014-04-10 08:04:04 -07:00
Guillaume J. Charmes 0c1b844ea4 Merge pull request #5087 from vbatts/vbatts-save_permissions 
docker save: fix filemode permissions
Upstream-commit: 4a88e111d094ed40894e304b15e03f90ff920350
Component: engine
 2014-04-10 08:00:37 -07:00
Guillaume J. Charmes 39bbc0e47b Merge pull request #5131 from crosbymichael/shm-mode 
Change shm mode to 1777
Upstream-commit: 042a50a8fe1e54ce602d1c517091381c209eabf3
Component: engine
 2014-04-10 07:50:32 -07:00
Guillaume J. Charmes b4f2aeb444 Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6 
Fix libcontainer network support on rhel6
Upstream-commit: 5b242c95da303ee26d3119678340050670fed45a
Component: engine
 2014-04-10 07:45:12 -07:00
Guillaume J. Charmes 9ad3dcddb0 Merge pull request #5133 from crosbymichael/revert-hairpin 
Revert "Support hairpin NAT without going through docker server"
Upstream-commit: ec9190cdd253a011881f646c8d6140cb1f0fcf9d
Component: engine
 2014-04-10 07:06:35 -07:00
Guillaume J. Charmes 405300e18f Merge pull request #5101 from unclejack/merge_release_v0.10.0 
Merge release v0.10.0
Upstream-commit: b602d6ca40c21622bcdbea32656ad0b6030c179b
Component: engine
 2014-04-08 16:09:47 -07:00
Guillaume J. Charmes 77371c5426 Merge pull request #5095 from crosbymichael/remove-ghost-test 
Remove restart ghost test
Upstream-commit: a10c17ad11dbe7da389d9bb2185e26ed56cd2204
Component: engine
 2014-04-08 14:40:42 -07:00
Guillaume J. Charmes c2ee8e861a Backup current docker apparmor profile and replace it with the new one 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 4f828d67f00449182eaada50dfba37e00f8f01ef
Component: engine
 2014-04-08 11:09:31 -07:00
Guillaume J. Charmes 06d3bd0a02 Merge pull request #5049 from Supermathie/aa-fix 
apparmor: docker-default: Include base abstraction
Upstream-commit: 8cfbc4466151666417a1245422ce0cb773d6d260
Component: engine
 2014-04-07 21:34:01 -07:00
Guillaume J. Charmes a8f5408909 Merge pull request #5025 from dstine/readme-fix 
fixed two readme typos
Upstream-commit: 1d2126be6cf9937ee5ec2174aa2e2d02c07eb40c
Component: engine
 2014-04-07 19:31:16 -07:00
Guillaume J. Charmes 71d38642f5 Merge pull request #4994 from crosbymichael/remove-start-test 
Remove racy test causing tests to stall
Upstream-commit: 9e29d65aad429978cfcfde7f447cabec3c6acc0b
Component: engine
 2014-04-03 14:49:35 -07:00
Guillaume J. Charmes 9fb042d57e Allow force sigint and allow sigquit after sigint 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: cd910cb6858541b432e20b650fad262772c9ef18
Component: engine
 2014-04-03 10:07:42 -07:00
Guillaume J. Charmes 0af2b8ab5b Return correct exit code upon signal + SIGQUIT now quits without cleanup 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3b3f4bf052e442543ec5772875ce7fbc77924596
Component: engine
 2014-04-02 05:56:11 -07:00
Guillaume J. Charmes 0423604572 Add API version to docker version 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: b246fc33ae4f05b5084fed8fc9f1034e36d87d78
Component: engine
 2014-04-01 17:30:19 -07:00
Guillaume J. Charmes f47a46d075 Merge pull request #4963 from tianon/check-config 
Add basic initial "check-config" script to contrib
Upstream-commit: 8ff02d58d99c547d59daa9e7bb3a8d4a1fe85121
Component: engine
 2014-04-01 16:51:32 -07:00
Guillaume J. Charmes d9e5457b6e Update Version to not use string anymore 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3ee37f547f4685ab88bfc39517cc18c1911451e5
Component: engine
 2014-04-01 15:46:52 -07:00
Guillaume J. Charmes 9cddc561e1 Change ownership to root for ADD file/directory 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 026aebdebbaa05eab25134949ed5d5bda655ba67
Component: engine
 2014-04-01 14:17:31 -07:00
Guillaume J. Charmes f2838447fa Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limit 
Fix dynamic port allocation limit
Upstream-commit: 7462cc6479c3a5c2f572bf9fe2bfc60a4f1e2506
Component: engine
 2014-04-01 13:49:21 -07:00
Guillaume J. Charmes b924033920 Merge pull request #4833 from crosbymichael/pluginflag 
Add opts flag for fine grained control over drivers
Upstream-commit: b4b87413d8d3fd20073975bcc84603fa7853d316
Component: engine
 2014-04-01 13:34:08 -07:00
Guillaume J. Charmes 99eaa02040 Update docs. Make PULL up to date, remove deprecated falg and update PUSH 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: b8d660d946c5f0be3a4f01867b11f26a4f303293
Component: engine
 2014-04-01 11:17:54 -07:00
Guillaume J. Charmes a2ee3725a5 Update test to be consistent 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 7a50f03fa69fb81c27d361333fadbc9cccdd8948
Component: engine
 2014-04-01 10:27:10 -07:00
Guillaume J. Charmes 9f401b129b Minor cleanup 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
 2014-04-01 10:27:05 -07:00
Guillaume J. Charmes e4f0a4813f Do not error when trying to start a started container 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: a03f83e3370f3859ebff172d504cc29817863b17
Component: engine
 2014-04-01 10:26:53 -07:00
Guillaume J. Charmes d65f1f9f12 Add $BINDIR to allow mounting the whole sources if needed (for development) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa
Component: engine
 2014-04-01 09:01:27 -07:00
Guillaume J. Charmes 9ef93e6d75 Allow push of a single tag 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
 2014-03-31 18:50:10 -07:00
Guillaume J. Charmes 1b87e1127a Merge pull request #4929 from crosbymichael/volume-abs-path 
Force abs paths for host volumes
Upstream-commit: f6f059d99af2d4ff7f6049221608b4fe9b82bf6a
Component: engine
 2014-03-31 15:19:30 -07:00
Guillaume J. Charmes 78874b1098 Add regression test 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 5fb28eab3e670f225019174987424be31a0d0527
Component: engine
 2014-03-31 13:12:22 -07:00
Guillaume J. Charmes fc43e586d9 Fix expending buffer in StdCopy 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e4aaacc2351d2e1dd4b69afeeee2aeab9c625efe
Component: engine
 2014-03-31 10:54:06 -07:00
Guillaume J. Charmes a21def5c37 Reduce error level form harmless errors 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: a2487aa683dc84938eb94c1ae29f8160d09441ea
Component: engine
 2014-03-31 09:07:56 -07:00
Guillaume J. Charmes 85082e995b Merge pull request #4873 from crosbymichael/add-internal-symlinks 
Follow symlinks inside container root for build's ADD
Upstream-commit: 45b43d85ecbffb7aa626c47ef086f09463d8f8f6
Component: engine
 2014-03-27 15:46:48 -07:00
Guillaume J. Charmes 528335a67b Merge pull request #4871 from crosbymichael/bip-exists 
Return error when existing bridge does not match ip
Upstream-commit: d848e2d113a6978a42cd5bb93fe57f9ea653b627
Component: engine
 2014-03-27 14:51:21 -07:00
Guillaume J. Charmes aa3273eb2a Merge pull request #4855 from unclejack/update_release_v0.9.1 
Update master for release 0.9.1
Upstream-commit: ab00619c56738c0704374c68fb43f4dd90b8887e
Component: engine
 2014-03-26 11:43:13 -07:00
Guillaume J. Charmes 70613c0a32 Fix fish completion when having alias on awk or grep 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e7f3234c1e4926c966f4c9e4cf08d9aae60d21bb
Component: engine
 2014-03-26 09:05:21 -07:00
Guillaume J. Charmes 665275b36f Merge pull request #4835 from crosbymichael/reverst-stop-kill 
Revert back to the default stop functionality of SIGKILL after timeout
Upstream-commit: c3ff1f41bbc03ad8fd6dad6461660ecf6c6ee67d
Component: engine
 2014-03-24 16:33:38 -07:00
Guillaume J. Charmes c2f15d709c Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm 
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
 2014-03-20 09:10:32 -07:00
Guillaume J. Charmes 884fb2e9f1 Merge pull request #3774 from danielnorberg/dns-search-domains 
configurable dns search domains
Upstream-commit: 3c9ae2b3483bf89de4245884ff5e463dc35818f4
Component: engine
 2014-03-19 14:52:49 -07:00
Guillaume J. Charmes 9f3a8a726d Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop 
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
 2014-03-18 11:28:42 -07:00
Guillaume J. Charmes 2e49d88eb6 Merge pull request #4739 from alexlarsson/dm-timeout 
devmapper: Increase timeout in waitClose to 10sec
Upstream-commit: 8ac6400749f6a000891b18ca1d36c10c8b7461d8
Component: engine
 2014-03-18 10:12:59 -07:00
Guillaume J. Charmes 3865d7d383 Merge pull request #4661 from vieux/add_no_prune 
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
 2014-03-17 16:07:55 -07:00
Guillaume J. Charmes c6aab2eaa4 Merge pull request #4723 from vieux/fix_panic_monitor 
fix panic in monitor
Upstream-commit: dd040c98706cd8ee3022061a63dc064b31fff890
Component: engine
 2014-03-17 13:52:22 -07:00
Guillaume J. Charmes f2c3e12ced Merge pull request #4678 from crosbymichael/move-runtime-deps 
Move runtime deps
Upstream-commit: 59035d291f78c6b9a4af83a27bd45ac8983bf58e
Component: engine
 2014-03-17 12:01:09 -07:00
Guillaume J. Charmes a3b952c15e Merge pull request #4364 from vieux/move_clone 
move git clone from daemon to client
Upstream-commit: f9bd6c860d2b07bd44f3dff98255bce34ded883b
Component: engine
 2014-03-17 11:36:56 -07:00
Guillaume J. Charmes 4ff432cad1 Merge pull request #4645 from crosbymichael/add-logger 
Add logger to libcontainer
Upstream-commit: 597e0812fb8a40cf73388bcc44e6be74035a9846
Component: engine
 2014-03-17 11:30:14 -07:00
Guillaume J. Charmes 6fae2857fa Merge pull request #4720 from vieux/fix_content-type_cp 
fix content-type detection in docker cp
Upstream-commit: d81021803820b807875ef76676d723eee5b0faee
Component: engine
 2014-03-17 11:24:18 -07:00
Guillaume J. Charmes f1b6288e96 Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask 
refactor(libcontainer): rename to CapabilitiesMask
Upstream-commit: 73f5aa87af0feb22570d1ea1b71ac58b874ac4cd
Component: engine
 2014-03-17 11:15:29 -07:00
Guillaume J. Charmes 3ace596568 Merge pull request #4676 from crosbymichael/no-sig-kill 
Send sigterm to child instead of sigkill
Upstream-commit: f9090567af360c37b5d3f3811834a8de3ac0e06d
Component: engine
 2014-03-14 16:44:08 -07:00
Guillaume J. Charmes de094b3b6d Merge pull request #4673 from vieux/update_test_TestCreateRmRunning 
update TestCreateRmRunning
Upstream-commit: 75738b8527f7578f8a18696bc6b49961790414cd
Component: engine
 2014-03-14 15:50:27 -07:00