Doug Davis
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
Zen Lin(Zhinan Lin)
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
Iavael
ab181ce557
Fixed handling hardlinks to symlinks in tar stream
...
Signed-off-by: Iavael <iavaelooeyt@gmail.com >
2015-03-03 16:10:53 +03:00
Evan Hazlett
d00e67b3f7
elaborate on testing for the driver spec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-03 07:15:07 -05:00
Evan Hazlett
2cf681d792
initial driver spec draft
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-03 07:01:18 -05:00
Jonathan Morley
0462a3b2fc
Add semicolons to fish output for docker-machine env command
...
This allows fish users to use `eval (docker-machine env ...)`
Signed-off-by: Morley, Jonathan <morley.jonathan@gmail.com >
2015-03-03 06:41:08 -05:00
Sascha Hanse
5bc443194c
Merge branch 'add_digitalocean_flags' of https://github.com/knarz/machine into add_digitalocean_flags
2015-03-03 12:24:20 +01:00
Sascha Hanse
17b928fac0
add flags for ipv6, backups and private networking to the DigitalOcean driver
...
Signed-off-by: Sascha Hanse <shanse@gmail.com >
2015-03-03 12:22:11 +01:00
Stephen J Day
ea50359c05
Update AUTHORS and default version package
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-02 23:39:19 -08:00
Stephen J Day
ad11768765
Update README and outline documentation
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-02 23:33:02 -08:00
resouer
dc0a6c1f5e
Rebase & update api doc v1.18 instead
...
Signed-off-by: harry zhang <resouer@163.com >
2015-03-03 12:32:17 +08:00
resouer
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
Jeffrey Morgan
0c28110b22
Bump version
2015-03-02 21:52:29 -05:00
Andrea Luzzardi
a25d0adf19
Merge pull request #439 from vieux/cleanup
...
cleanup: SwarmCluster -> Cluster && Node to node
2015-03-02 18:06:15 -08:00
Victor Vieux
0569f7d4dd
swarm.Node -> swarm.node && some method now private
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-02 18:02:31 -08:00
Victor Vieux
92ab1e347c
cleanup swarm scheduler code
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-02 17:55:06 -08:00
Andrea Luzzardi
3267a25bdc
Merge pull request #441 from vieux/remove_force_refresh
...
remove proxyContainerAndForceRefresh
2015-03-02 17:51:36 -08:00
Tianon Gravi
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
Jeffrey Morgan
643d705d2d
Merge pull request #208 from kitematic/bug-fixes
...
Fix minor bugs
2015-03-02 20:22:16 -05:00
Jeffrey Morgan
d7cd96f593
Fix minor bugs
...
- Restart now keeps the same port
- Terminal into container no longer depends on active machine
2015-03-02 20:17:53 -05:00
Victor Vieux
e075c8fd46
remove proxyContainerAndForceRefresh
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-02 17:11:09 -08:00
Sean Li
cedec0eee1
Copy tweak.
2015-03-02 17:07:37 -08:00
Victor Vieux
70e033c07c
update roadmap.md
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-02 15:46:46 -08:00
Jessie Frazelle
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
Evan Hazlett
7bf67e41c9
Merge pull request #615 from ehazlett/integration-testing
...
switch to bats for integration testing
2015-03-02 17:24:47 -05:00
Evan Hazlett
f3bd689485
Merge pull request #689 from ehazlett/ec2-fix-iam-tests
...
ec2: fix iam test
2015-03-02 17:23:45 -05:00
Evan Hazlett
2ea5a976d8
ec2: fix iam test
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-02 17:20:47 -05:00
Tianon Gravi
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
Sean Li
bf672328b8
Minor term change.
2015-03-02 14:17:56 -08:00
Evan Hazlett
5f01d4cda5
Merge pull request #449 from sthulb/aws-assign-roles
...
IRC Req: EC2 IAM Instance Profile
2015-03-02 17:12:27 -05:00
Evan Hazlett
588a70ccce
Merge pull request #686 from ehazlett/ec2-fix-swarm-port-auth
...
ec2: do not try to auth swarm port if exists
2015-03-02 17:06:48 -05:00
Shishir Mahajan
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
Alexander Morozov
32ccde46dd
Merge pull request #11106 from MabinGo/fix_log_info
...
Fix some revision about log output
2015-03-02 13:55:43 -08:00
Tianon Gravi
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
Evan Hazlett
2792f1ec89
ec2: update tests for configuring ip permissions
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-02 16:21:14 -05:00
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
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
moxiegirl
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
Jessie Frazelle
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
Jessie Frazelle
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
Sean Li
6244dfe7e7
Solves confusion for new users whether it's a picture image or a Docker image.
2015-03-02 12:06:21 -08:00
Sean Li
89320bd481
Tweaked copy for placeholder.
2015-03-02 12:00:54 -08:00
Simon Thulbourn
2ce70bf5ac
adds the ability to set an instance role for ec2 instances
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com >
2015-03-02 19:01:22 +00:00
Stephen J Day
6add5f30d2
documentation for name validation grammar
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-02 10:55:31 -08:00
Sean Li
9e2de23580
Fixed typo.
2015-03-02 10:54:18 -08:00
Stephen Day
16d8b2c34d
Merge pull request #213 from stevvooe/docker-upload-uuid
...
doc/spec, registry/handlers: specify and implement Docker-Upload-UUID
2015-03-02 10:51:15 -08:00
Stephen Day
41e03596de
Merge pull request #208 from endophage/path_traversal_tests
...
registry/api/v2: test cases for path traversal and bad characters
2015-03-02 10:49:35 -08:00
Jessie Frazelle
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
Aanand Prasad
33c7b3f752
Merge pull request #1052 from albers/bash-completion-rm-f
...
Add -f flag to bash completion for docker-compose rm
2015-03-02 18:15:12 +00:00