toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,515 Commits 3 Branches 295 Tags
aa9b58cd0bdd9e55605253916d42c0a08b626b95
Commit Graph
13515 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes aa9b58cd0b Don't test resolv.conf updater on overlay filesystem 
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed.  The new test
(from #10703) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.

This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.

See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9057ca2541582fc41eb7cb45edd332247a813bba
Component: engine
 2015-03-05 00:22:01 -05:00
Alexander Morozov cc537ac671 Merge pull request #11162 from SvenDowideit/if-nil-call-with-nil 
Seems like an un-necessary if statement
Upstream-commit: 5035fa1e21947bfd229639c5c83c89d6bda0a1a9
Component: engine
 2015-03-04 13:59:27 -08:00
Sven Dowideit 8d2cefd5a5 Seems like an un-necessary if statement 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 4e5ea0c8755231dfffd7b82bc6551415b14ed0de
Component: engine
 2015-03-04 13:24:17 -08:00
Alexander Morozov e708804317 Merge pull request #11000 from anandkumarpatel/invalidate-probe 
Improve build speed
Upstream-commit: e0823b09ec679a64a0d9d0f73f470abbd43dd75a
Component: engine
 2015-03-04 11:35:00 -08:00
Jessie Frazelle 97033cc69f Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
 2015-03-04 18:42:20 +00:00
Jessie Frazelle 5a0621576b Merge pull request #11046 from bfirsh/rename-fig-to-compose 
Rename fig to compose
Upstream-commit: 4bccf278bd1f19ac5d9499818bffa7fa6f8d7f98
Component: engine
 2015-03-04 08:39:01 -08:00
Ben Firshman c182424825 Rename fig to compose 
It's now at https://github.com/docker/compose

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: a6824ea7f2b22f7c3da11307c55acd04dac6505a
Component: engine
 2015-03-04 16:35:56 +00:00
Phil Estes c154ff2dc2 Merge pull request #10713 from swagiaal/pickup-created-resolvconf 
Update resolv.conf in containers on file creation.
Upstream-commit: 2380004d30769e9abc2a975dc9f89d83cc459d5f
Component: engine
 2015-03-04 10:21:36 -05:00
Tibor Vass 031bee35d5 Merge pull request #11147 from ahmetalpbalkan/archive_test_fix 
pkg/archive: rm invalid test case from achive_windows_test.go
Upstream-commit: 973c32c8a07bca01aa5889689f37b99694673490
Component: engine
 2015-03-04 09:51:36 -05:00
Tibor Vass 3a5f5c3238 Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests 
Last three tests skip on lxc.
Upstream-commit: ffc738225db412987d0230f2a557d6115a1bb45e
Component: engine
 2015-03-04 09:51:06 -05:00
Jessica Frazelle 55588c146b Last three tests skip on lxc. 
Now we can scale lxc tests to all PRs.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 321874f37672b2424a7609caa1aac616b3b23c6a
Component: engine
 2015-03-04 06:04:25 -08:00
Jessie Frazelle 0a68f32fe6 Merge pull request #11077 from tianon/debootstrap-PATH 
Update debootstrap PATH+chroot handling
Upstream-commit: 0f6704f961642daeeda99e95a034b40857bda627
Component: engine
 2015-03-04 06:01:25 -08:00
Jessie Frazelle cd57675c32 Merge pull request #11134 from duglin/CheckMultiLineHelp 
Fix 'docker ps --help' so the options don't span more than one line
Upstream-commit: ffc755ac14a49f41d0b27204b0a50034397c946e
Component: engine
 2015-03-04 05:53:47 -08:00
Phil Estes 3ad72ddc8c Merge pull request #11155 from coolljt0725/add_xfs_magic 
Fix docker info show unknown backing filesystem when use xfs
Upstream-commit: e2c79e2b307e9a3ca9fa4719cd536b03c167365b
Component: engine
 2015-03-04 07:59:23 -05:00
Jessie Frazelle 36f1975bfd Merge pull request #9437 from cpuguy83/set_rlimits_in_container 
Allow setting ulimits for containers
Upstream-commit: df7ba57f5f962b1a2d2e267a89ae465541a92371
Component: engine
 2015-03-04 04:00:17 -08:00
Jessie Frazelle 79e4db479d Merge pull request #11133 from zenlinTechnofreak/zenlinFormatBridgeDriver 
Just format some logs and notes in /daemon/networkdriver/bridge/driver.g...
Upstream-commit: d64b009bc07e1adc550d40bd35efb0d2fc3e35e5
Component: engine
 2015-03-04 03:57:29 -08:00
Jessie Frazelle 2d903c82e5 Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix 
integration-cli: Remove timeout dependency on TestEventsUntag
Upstream-commit: a8b699f5d9a409702fd85a91f87f05f6bab267ed
Component: engine
 2015-03-04 03:54:33 -08:00
Jessie Frazelle 6827e12a3d Merge pull request #10858 from duglin/10807-MixedcaseDockerfile 
Support dockerfile and Dockerfile
Upstream-commit: beea697be365631ceeb92761e094f1ffe307ca33
Component: engine
 2015-03-04 03:52:49 -08:00
Lei Jitang e00d9f2fa2 Add xfs fs magic to graphdriver/driver.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dd56fa190695a969673f6f663cd5fe78b7c22787
Component: engine
 2015-03-04 19:01:39 +08:00
moxiegirl 570cc01da3 Merge pull request #11051 from bdehamer/add-registry-api-client-library 
Add reference to docker-reg-client
Upstream-commit: 98630b2ef62653d288430b25867ddacbf1731441
Component: engine
 2015-03-03 20:41:42 -08:00
Ahmet Alp Balkan e76b08f45b pkg/archive: rm invalid test case from achive_windows_test.go 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: baebff38d5f5d1cdecbc2544e22a42acf82bbf93
Component: engine
 2015-03-03 18:42:52 -08:00
Doug Davis bc3e4a6737 Support dockerfile and Dockerfile 
Closes #10807

Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 15924f238503ffe44e5fcb99415ff753a36e5971
Component: engine
 2015-03-03 18:38:50 -08:00
Fred Lifton d03a76c848 Merge pull request #11091 from chenhanxiao/See-also-login-start 
docs: add See Also for description of login/logout and start/stop
Upstream-commit: 5929f401fcf5433ef0f2df960191cc44bf859618
Component: engine
 2015-03-03 14:49:59 -08:00
Fred Lifton f058d0499c Merge pull request #11140 from SvenDowideit/correct-notes-markup 
Notes should be indented
Upstream-commit: b47ab8cfa3191fbbb85aae0c53dc1de207e2c929
Component: engine
 2015-03-03 14:16:56 -08:00
Sven Dowideit 72dd46b2de Notes should be indented 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 93c82360a6b530ef86769ee04e027f6159dc55da
Component: engine
 2015-03-03 13:58:35 -08:00
Doug Davis 8c703a14a3 Fix 'docker ps --help' so the options don't span more than one line 
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
 2015-03-03 10:02:23 -08:00
Zen Lin(Zhinan Lin) 1e821173bd Just format some logs and notes in /daemon/networkdriver/bridge/driver.go 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 2c0e027ab9b7da131451d571c4d0f25bc5fc14eb
Component: engine
 2015-03-03 23:39:04 +08:00
resouer d382609cd2 Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
 2015-03-03 12:32:17 +08:00
resouer f947fbc4ae Add cors header flag and leave boolean flag not changed 
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
 2015-03-03 11:21:19 +08:00
Jessie Frazelle d146803485 Merge pull request #11121 from shishir-a412ed/docker_help_issue 
Fix: docker -d -h start daemon instead of showing help menu
Upstream-commit: 8e107a93210c54f22ec1354d969c771b1abfbe05
Component: engine
 2015-03-02 15:40:27 -08:00
Shishir Mahajan cbc491abc7 Fix: docker -d -h start daemon instead of showing help menu 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 0ab28c658952267af8e86a5b1055dd4b9cf0ec51
Component: engine
 2015-03-02 17:01:56 -05:00
Alexander Morozov 2d25573473 Merge pull request #11106 from MabinGo/fix_log_info 
Fix some revision about log output
Upstream-commit: 32ccde46dde5130adcfb170c846c8f0317761aee
Component: engine
 2015-03-02 13:55:43 -08:00
Jessie Frazelle a0531c5103 Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip 
integ-cli: skip tests launching registry-v2
Upstream-commit: f92213af882761a739fa0d8408e180e437b1a380
Component: engine
 2015-03-02 12:41:21 -08:00
Jessie Frazelle 7023b06ad1 Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows 
api\server: Factored out UnixHttp on Windows, supported on Linux only.
Upstream-commit: c5ecdfd878d67d0595561a04e4945f60893f8c6f
Component: engine
 2015-03-02 12:40:20 -08:00
Jessie Frazelle b2afcdf656 Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix 
integ-cli: fix TestCommitChange for pulled busybox
Upstream-commit: bedf3f8f201a06a1d0e9add103da2138a375ae97
Component: engine
 2015-03-02 12:39:34 -08:00
moxiegirl 6a658a3da6 Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote 
fix err in note at daemon/networkdriver/bridge/driver.go
Upstream-commit: 377e62aa027337cf360f22cbf54fdec87743776f
Component: engine
 2015-03-02 12:31:37 -08:00
Jessie Frazelle c6435e1b51 Merge pull request #10986 from crosbymichael/create-api-type 
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
 2015-03-02 12:22:02 -08:00
Jessie Frazelle d23101e569 Merge pull request #11055 from MabinGo/checkfileoper2 
when the file that was opened has been read into buffer, the file should be closed
Upstream-commit: 1500503b29d97257cf8c1789fc320e2409d9b394
Component: engine
 2015-03-02 12:18:14 -08:00
Jessie Frazelle d0e86ebf79 Merge pull request #11054 from MabinGo/checkfileoper1 
Add the file close operation before function return to advoid resource leaking
Upstream-commit: 82aa950f4e10dbd45b16ecfc144f8d4b450ad1ff
Component: engine
 2015-03-02 10:44:26 -08:00
Phil Estes aeb9a73d60 Merge pull request #11083 from MabinGo/minor_typo 
Modify the minor typo in deviceset.go
Upstream-commit: 738bdec4908755761b27b7d15baeefb1a824f770
Component: engine
 2015-03-02 13:11:14 -05:00
Tibor Vass dcdf67a6ec Merge pull request #11112 from tianon/bashrc-for-tibor-♥ 
Add support for an optional ".bashrc" file
Upstream-commit: 360adc707b6ec2023178ed95befeb5514e530ca3
Component: engine
 2015-03-02 13:02:39 -05:00
Tianon Gravi 0a09f8ffe0 Add support for an optional ".bashrc" file 
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c62230a879e0461c43a4fc7d2e2e2efdd466fedd
Component: engine
 2015-03-02 10:33:26 -07:00
Zen Lin(Zhinan Lin) 8ce83c8f78 fix err in note at daemon/networkdriver/bridge/driver.go 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: e5bc50b5cd5237e820f5a708d0c351581905f1e2
Component: engine
 2015-03-03 00:52:53 +08:00
Phil Estes 8ccc0c87e2 Merge pull request #11003 from brahmaroutu/rename_10996 
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
 2015-03-02 09:48:07 -05:00
moxiegirl b8344b4ef2 Merge pull request #11060 from dmitrygusev/docs-improvements 
Docs improvements typo fixes and consistency
Upstream-commit: 6bbf5c3e99d9943d6526a415de0875c441266eff
Component: engine
 2015-03-02 06:46:17 -08:00
Phil Estes ae2cbed644 Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix 
To avoid the confusing in log, change '%s' to '%q', change the question ...
Upstream-commit: a3dc3bb758a40562f34659846b18243c72e94caa
Component: engine
 2015-03-02 09:30:59 -05:00
Phil Estes 69f4fa385f Merge pull request #11096 from MabinGo/fix_comments_typo 
fix wrong description and typo in daemon/graphdriver/devmapper/deviceset.go
Upstream-commit: 5c2a602b4e227ed617d0494bdaeb2e191a6b9fca
Component: engine
 2015-03-02 08:55:51 -05:00
Zen Lin(Zhinan Lin) 87e987a3ef To avoid the confusing in log, change '%s' to '%q', change the question sentence to a reminding sentence. 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 08ea03ccb9c6c671b465572e4a5c9a5d1da1fda0
Component: engine
 2015-03-02 19:14:22 +08:00
Mabin 4a59461365 Fix some revision about log output 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: adfd1ddfc6e094295d07ff2b36fb6e91cf7878dd
Component: engine
 2015-03-02 17:06:38 +08:00
Mabin f3df541809 fix typo of comments in daemon/graphdriver/devmapper/deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: f4ac86de84c25bf1793d1e934695b7119dc51b70
Component: engine
 2015-03-02 02:11:15 +08:00