Ben Firshman
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
Jessica Frazelle
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
Phil Estes
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
Tibor Vass
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
Tibor Vass
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
Jessica Frazelle
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
Jessie Frazelle
0f6704f961
Merge pull request #11077 from tianon/debootstrap-PATH
...
Update debootstrap PATH+chroot handling
2015-03-04 06:01:25 -08:00
Jessie Frazelle
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
Phil Estes
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
Jessie Frazelle
df7ba57f5f
Merge pull request #9437 from cpuguy83/set_rlimits_in_container
...
Allow setting ulimits for containers
2015-03-04 04:00:17 -08:00
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
beea697be3
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
2015-03-04 03:52:49 -08:00
Lei Jitang
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
Ben Firshman
08f936b2e7
Fix missing space in rails docs
...
From #1031
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-03-04 10:27:25 +00:00
Ben Firshman
df925bc759
Merge pull request #1031 from fredlf/edit-qs-guides
...
Edits and revisions to Compose Quickstart guides
2015-03-04 10:26:32 +00:00
moxiegirl
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
Stephen J Day
dc0408767a
Remove unnecessary close in client
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-03-03 19:29:12 -08:00
Ahmet Alp Balkan
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
Doug Davis
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
Kitematic
fc37df6e3e
Update for Apache license.
...
Update for Apache license.
2015-03-03 21:16:57 -05:00
Michael Chiang
36b391d32c
Merge pull request #216 from kitematic/mike
...
Kitematic roadmap update.
2015-03-03 21:10:43 -05:00
Stephen Day
bfef2046e8
Merge pull request #218 from endophage/DIST-148
...
registry/storage: buffered wrapper for fileWriter
2015-03-03 18:08:28 -08:00
Kitematic
f804bc88aa
Kitematic roadmap update.
...
Kitematic roadmap update.
2015-03-03 21:08:26 -05:00
Michael Chiang
ef412bd5a9
Merge pull request #215 from kitematic/mike
...
Change to Apache license.
2015-03-03 20:41:12 -05:00
Andrea Luzzardi
d0b10516d6
integration: Remove manage-non-available-node test.
...
It makes integration tests run really slow.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-03-03 17:39:55 -08:00
Kitematic
18b7e95198
Change to Apache license.
...
Change to Apache license.
2015-03-03 20:38:22 -05:00
Andrea Luzzardi
7dc04ee694
integration: Do not verify git hash since it's set to HEAD in master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-03-03 17:35:07 -08:00
Andrea Luzzardi
998cc63f78
bats: Convert encoding to utf-8 unix.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-03-03 17:34:42 -08:00
Stephen Day
72b48812b4
Merge pull request #212 from stevvooe/add-documentation-name-validator
...
documentation for name validation grammar
2015-03-03 17:32:54 -08:00
Andrea Luzzardi
fa22dbf6a6
Integration tests: Deterministic swarm binary path resolution
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-03-03 17:30:07 -08:00
Andrea Luzzardi
fe900c0c5c
Merge pull request #444 from vieux/add_inspect_img
...
add inspect for images
2015-03-03 17:21:30 -08:00
Evan Hazlett
6da2128e23
Merge pull request #700 from nathanleclaire/ec2_fixes
...
EC2 fixes
2015-03-03 17:12:02 -08:00
Victor Vieux
426953c866
add inspect for images
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-03 16:30:31 -08:00
David Lawrence
5161d69ebf
wrap buffered writer around filewriter
...
benchmarks added to filewriter_test, demonstrate buffered
version is ~5x faster on my hardware.
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-03-03 16:23:21 -08:00
Andrea Luzzardi
fd8ff48bec
Merge pull request #443 from chanwit/bats-func-tests
...
Proposal: PoC for Bats integration tests
2015-03-03 16:18:41 -08:00
Andrea Luzzardi
2e65728d12
Merge pull request #423 from bfirsh/point-to-docs-in-readme
...
Point to documentation in the readme
2015-03-03 16:01:35 -08:00
Fred Lifton
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
Nathan LeClaire
8d0bf21c6d
Fix panic when instance doesn't exist remotely
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-03-03 14:48:04 -08:00
Nathan LeClaire
a7d1a70442
Fix IP address not being set correctly due to race
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-03-03 14:47:06 -08:00
Srini Brahmaroutu
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
Fred Lifton
b47ab8cfa3
Merge pull request #11140 from SvenDowideit/correct-notes-markup
...
Notes should be indented
2015-03-03 14:16:56 -08:00
Sven Dowideit
93c82360a6
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-03-03 13:58:35 -08:00
Chanwit Kaewkasi
046f26f1b8
add Bats integration tests
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-03-04 03:13:30 +07:00
Evan Hazlett
9404aa2f88
move driver spec to docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-03 11:51:56 -08:00
Evan Hazlett
2c8823fab7
Merge pull request #697 from nathanleclaire/ec2_clean
...
Clean up unused function
2015-03-03 11:50:19 -08:00
Tianon Gravi
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
Nathan LeClaire
3a030c9ccb
Clean up unused function
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-03-03 11:18:08 -08:00
Evan Hazlett
e433f7100f
Merge pull request #684 from jonathanmorley/fish-semicolons
...
Add semicolons to fish output for docker-machine env command
2015-03-03 11:15:53 -08:00
Stephen Day
ce6e7c9af2
Merge pull request #228 from stevvooe/update-version-authors
...
Update AUTHORS and default version package
2015-03-03 10:54:19 -08:00