e0823b09ec
Merge pull request #11000 from anandkumarpatel/invalidate-probe
...
Improve build speed
2015-03-04 11:35:00 -08:00
7b3ffd5cc0
Merge pull request #10586 from resouer/10532-fix-cors-hardcode
...
Fix 10532 to change --api-enable-cors to string.
2015-03-04 18:42:20 +00:00
4bccf278bd
Merge pull request #11046 from bfirsh/rename-fig-to-compose
...
Rename fig to compose
2015-03-04 08:39:01 -08:00
a6824ea7f2
Rename fig to compose
...
It's now at https://github.com/docker/compose
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-04 16:35:56 +00:00
80d585b0c7
Skip new ulimits test on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-04 08:28:32 -08:00
2380004d30
Merge pull request #10713 from swagiaal/pickup-created-resolvconf
...
Update resolv.conf in containers on file creation.
2015-03-04 10:21:36 -05:00
973c32c8a0
Merge pull request #11147 from ahmetalpbalkan/archive_test_fix
...
pkg/archive: rm invalid test case from achive_windows_test.go
2015-03-04 09:51:36 -05:00
ffc738225d
Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests
...
Last three tests skip on lxc.
2015-03-04 09:51:06 -05:00
321874f376
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)
2015-03-04 06:04:25 -08:00
0f6704f961
Merge pull request #11077 from tianon/debootstrap-PATH
...
Update debootstrap PATH+chroot handling
2015-03-04 06:01:25 -08:00
ffc755ac14
Merge pull request #11134 from duglin/CheckMultiLineHelp
...
Fix 'docker ps --help' so the options don't span more than one line
2015-03-04 05:53:47 -08:00
e2c79e2b30
Merge pull request #11155 from coolljt0725/add_xfs_magic
...
Fix docker info show unknown backing filesystem when use xfs
2015-03-04 07:59:23 -05:00
df7ba57f5f
Merge pull request #9437 from cpuguy83/set_rlimits_in_container
...
Allow setting ulimits for containers
2015-03-04 04:00:17 -08:00
d64b009bc0
Merge pull request #11133 from zenlinTechnofreak/zenlinFormatBridgeDriver
...
Just format some logs and notes in /daemon/networkdriver/bridge/driver.g...
2015-03-04 03:57:29 -08:00
a8b699f5d9
Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix
...
integration-cli: Remove timeout dependency on TestEventsUntag
2015-03-04 03:54:33 -08:00
beea697be3
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
2015-03-04 03:52:49 -08:00
dd56fa1906
Add xfs fs magic to graphdriver/driver.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-04 19:01:39 +08:00
98630b2ef6
Merge pull request #11051 from bdehamer/add-registry-api-client-library
...
Add reference to docker-reg-client
2015-03-03 20:41:42 -08:00
baebff38d5
pkg/archive: rm invalid test case from achive_windows_test.go
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-03 18:42:52 -08:00
15924f2385
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>
2015-03-03 18:38:50 -08:00
5929f401fc
Merge pull request #11091 from chenhanxiao/See-also-login-start
...
docs: add See Also for description of login/logout and start/stop
2015-03-03 14:49:59 -08:00
ce02578317
Allow use of just image name without the tag
...
Addresses #10645
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-03-03 22:38:45 +00:00
b47ab8cfa3
Merge pull request #11140 from SvenDowideit/correct-notes-markup
...
Notes should be indented
2015-03-03 14:16:56 -08:00
93c82360a6
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-03 13:58:35 -08:00
8625a281c6
Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-03 12:42:38 -07:00
5595da2bde
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>
2015-03-03 10:02:23 -08:00
2c0e027ab9
Just format some logs and notes in /daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 23:39:04 +08:00
dc0a6c1f5e
Rebase & update api doc v1.18 instead
...
Signed-off-by: harry zhang <resouer@163.com>
2015-03-03 12:32:17 +08:00
f3dd2db4ff
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>
2015-03-03 11:21:19 +08:00
dec67f7f57
Update contrib/mkimage/debootstrap whitespace for consistency
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 18:33:38 -07:00
8e107a9321
Merge pull request #11121 from shishir-a412ed/docker_help_issue
...
Fix: docker -d -h start daemon instead of showing help menu
2015-03-02 15:40:27 -08:00
5118f1431c
Add secondary "simple" Dockerfile
...
This is the absolute bare minimum necessary to compile and test Docker -- this is going to be especially useful for testing and verifying assumptions.
With this, we can setup a Jenkins job that tests to ensure that all the work we do to make sure our build scripts and tests don't contain assumptions is not effort spent in vain.
This is important because this is the kind of bare-bones stock environment our packagers build in. Additionally, this verifies that our scripts will work reasonably on other platforms (such as Darwin and Windows) as well.
Assumptions existing tests make that currently fail:
- `registry-v2` exists as a binary in `$PATH` (FIXED IN #11005 🎉 )
- `unprivilegeduser` exists as a user in `/etc/passwd`
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 15:20:16 -07:00
0ab28c6589
Fix: docker -d -h start daemon instead of showing help menu
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-03-02 17:01:56 -05:00
32ccde46dd
Merge pull request #11106 from MabinGo/fix_log_info
...
Fix some revision about log output
2015-03-02 13:55:43 -08:00
351074edcd
Download busybox from the Hub instead of GitHub
...
This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time. This ensures the test suite runs more consistently.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 14:38:19 -07:00
f92213af88
Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip
...
integ-cli: skip tests launching registry-v2
2015-03-02 12:41:21 -08:00
c5ecdfd878
Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
...
api\server: Factored out UnixHttp on Windows, supported on Linux only.
2015-03-02 12:40:20 -08:00
bedf3f8f20
Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix
...
integ-cli: fix TestCommitChange for pulled busybox
2015-03-02 12:39:34 -08:00
377e62aa02
Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote
...
fix err in note at daemon/networkdriver/bridge/driver.go
2015-03-02 12:31:37 -08:00
2bfa701f45
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
2015-03-02 12:22:02 -08:00
1500503b29
Merge pull request #11055 from MabinGo/checkfileoper2
...
when the file that was opened has been read into buffer, the file should be closed
2015-03-02 12:18:14 -08:00
82aa950f4e
Merge pull request #11054 from MabinGo/checkfileoper1
...
Add the file close operation before function return to advoid resource leaking
2015-03-02 10:44:26 -08:00
738bdec490
Merge pull request #11083 from MabinGo/minor_typo
...
Modify the minor typo in deviceset.go
2015-03-02 13:11:14 -05:00
360adc707b
Merge pull request #11112 from tianon/bashrc-for-tibor-♥
...
Add support for an optional ".bashrc" file
2015-03-02 13:02:39 -05:00
c62230a879
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>
2015-03-02 10:33:26 -07:00
e5bc50b5cd
fix err in note at daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 00:52:53 +08:00
89db94ecf9
Merge pull request #11003 from brahmaroutu/rename_10996
...
Prefix / is ignored when container is renamed
2015-03-02 09:48:07 -05:00
6bbf5c3e99
Merge pull request #11060 from dmitrygusev/docs-improvements
...
Docs improvements typo fixes and consistency
2015-03-02 06:46:17 -08:00
a3dc3bb758
Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix
...
To avoid the confusing in log, change '%s' to '%q', change the question ...
2015-03-02 09:30:59 -05:00
5c2a602b4e
Merge pull request #11096 from MabinGo/fix_comments_typo
...
fix wrong description and typo in daemon/graphdriver/devmapper/deviceset.go
2015-03-02 08:55:51 -05:00
Alexander Morozov
Jessie Frazelle
Ben Firshman
Jessica Frazelle
Phil Estes
Tibor Vass
Lei Jitang
moxiegirl
Ahmet Alp Balkan
Doug Davis
Fred Lifton
Srini Brahmaroutu
Sven Dowideit
Tianon Gravi
Zen Lin(Zhinan Lin)
resouer
resouer
Shishir Mahajan