Michael Crosby
5bc2ff8a36
Bump to version 1.4.1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-15 15:57:00 -08:00
Brian Goff
a83dadbeaf
Fix volumes-from/bind-mounts passed in on start
...
Fixes #9628
Slightly reverts #8683 , HostConfig on start is _not_ deprecated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-12-15 15:54:06 -08:00
Michael Crosby
eac27ad46d
Add test to enforce volume build content
...
This tests ensures that the content from a dir within a build is carried
over even if VOLUME for that dir is specified in the Dockerfile. This
test ensures this long standing functionality.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-15 15:53:55 -08:00
Michael Crosby
24d03b8dde
Merge pull request #9631 from cpuguy83/9628_fix_volumes_hostconfig_on_start
...
Fix volumes-from/bind-mounts passed in on start
2014-12-15 15:51:57 -08:00
Jacob Edelman
97f07bb61c
Fixed two misspellings.
...
Fixed two misspellings of the word "beginning".
Signed-off-by: JacobEdelman <edelman.jd@gmail.com >
2014-12-15 18:15:07 -05:00
Victor Vieux
c2c790e6da
update README.mds
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-15 23:04:00 +00:00
Victor Vieux
6e39962998
-addr -> multiple -H + unix
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-15 23:02:23 +00:00
Michael Crosby
b84bfb43cd
Merge pull request #9638 from crosbymichael/build-volumes-retain-contents
...
Add test to enforce volume build content
2014-12-15 14:54:38 -08:00
Brian Bland
c51ea97234
Allows HTTP bind address to be overridden by an environment variable
...
Uses REGISTRY_HTTP_ADDR
2014-12-15 14:17:51 -08:00
Nathan LeClaire
b350a99bec
Allow optional override of os and arch in build
...
With this change machine will still cross-compile for all supported OSes
/ archs by default, but allows user to customize args to the build
script.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2014-12-15 14:12:17 -08:00
Olivier Gambier
a35273a0db
Merge pull request #854 from stevvooe/next-generation
...
NG: Use filesystem driver in default configuration
2014-12-15 13:53:53 -08:00
Brian Goff
d44c9f9147
Fix volumes-from/bind-mounts passed in on start
...
Fixes #9628
Slightly reverts #8683 , HostConfig on start is _not_ deprecated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-12-15 16:51:15 -05:00
Jessie Frazelle
03142fd5d2
Merge pull request #9674 from LK4D4/log_done
...
Fix missing logDone for TestRunMutableNetworkFiles
2014-12-15 13:48:04 -08:00
Alexander Morozov
03bdacbb4e
Fix missing logDone for TestRunMutableNetworkFiles
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2014-12-15 13:44:22 -08:00
Harald Albers
46b104bd39
Refactor completion for docker run and docker create
...
_docker_run and _docker_create had only one differing line.
This refactoring features:
- direct completion for both commands to the same function
- factor out the common arguments, sort & format them nicely
- compute the argument for _docker_pos_first_nonflag.
Signed-off-by: Harald Albers <github@albersweb.de >
2014-12-15 21:08:49 +01:00
Jean-Tiare Le Bigot
c230f70413
Set HTTP upgrade header only when requested by client
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
2014-12-15 21:05:59 +01:00
Stephen J Day
6e846d6b29
Use filesystem driver in default configuration
2014-12-15 11:53:52 -08:00
Ben Firshman
7a425647a0
Merge pull request #97 from bfirsh/cli-regressions
...
Fix CLI regressions
2014-12-15 19:04:47 +00:00
Ben Firshman
4049f7ed22
Rename ~/.docker/hosts to ~/.docker/machines
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-15 10:55:40 -08:00
Ben Firshman
a913c06888
Restore sorting of ls output
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-15 10:46:35 -08:00
Ben Firshman
91172449c0
Handle errors in commands
...
Some errors were swallowed entirely, some didn't print the error
message.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-15 10:45:55 -08:00
Jessie Frazelle
e6a68a1c87
Merge pull request #9613 from pwaller/push-err-confusion-fix
...
Improve message when pushing a non-existent image
2014-12-15 09:54:34 -08:00
Ben Firshman
da95ea3968
Merge pull request #103 from ggiamarchi/machine-name-optional
...
Make machine name optional in CLI
2014-12-15 17:53:30 +00:00
Ben Firshman
e401c4464c
Merge pull request #101 from ggiamarchi/fix-interactive-ssh
...
Fix bug SSH interactive mode
2014-12-15 17:52:53 +00:00
Alexander Morozov
1bdf579928
Merge pull request #9642 from jfrazelle/windows
...
Add windows back.
2014-12-15 08:36:36 -08:00
Tibor Vass
5e888abf7a
Merge pull request #9666 from LK4D4/cleanup_tests
...
Remove TestRunExitOnStdinClose
2014-12-15 11:24:40 -05:00
Alexander Morozov
c533d2cb9b
Merge pull request #9668 from viirya/fix_error_type
...
Fix incorrect error type
2014-12-15 08:18:34 -08:00
Jessie Frazelle
f58a79e591
Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
...
Fix #9462
2014-12-15 08:13:11 -08:00
Kamil Domanski
51da97628a
Add available filters for containers, images and events to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
2014-12-15 16:51:29 +01:00
Kamil Domanski
37bdb05615
Add container list filtering to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
2014-12-15 16:50:56 +01:00
unclejack
7da0f2ee19
Merge pull request #9660 from LK4D4/remove_bad_test
...
Remove TestRunErrorBindNonExistingSource
2014-12-15 17:20:17 +02:00
Doug Davis
d942c59b69
Wrap strings that could look like ints in quotes
...
When we use the engine/env object we can run into a situation where
a string is passed in as the value but later on when we json serialize
the name/value pairs, because the string is made up of just numbers
it appears as an integer and not a string - meaning no quotes. This
can cause parsing issues for clients.
I tried to find all spots where we call env.Set() and the type of the
name being set might end up having a value that could look like an int
(like author). In those cases I switched it to use env.SetJson() instead
because that will wrap it in quotes.
One interesting thing to note about the testcase that I modified is that
the escaped quotes should have been there all along and we were incorrectly
letting it thru. If you look at the metadata stored for that resource you
can see the quotes were escaped and we lost them during the serialization
steps because of the env.Set() stuff. The use of env is probably not the
best way to do all of this.
Closes : #9602
Signed-off-by: Doug Davis <dug@us.ibm.com >
2014-12-15 05:10:49 -08:00
Mohammad Salehe
3c105c6db2
Fix typo in dns_search documentation
...
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com >
2014-12-15 16:37:32 +03:30
Mohammad Salehe
5182bd0968
Add dns_search support in yml config
...
Signed-off-by: Mohammad Salehe <salehe@gmail.com >
2014-12-15 16:37:31 +03:30
James Turnbull
24a8182928
Merge pull request #9633 from estesp/docs-ubuntu-install
...
DOCS: Update Ubuntu install instructions regarding dated Ubuntu docker.io
2014-12-15 04:52:27 -05:00
Liang-Chi Hsieh
bc4edbbe71
Fix incorrect error type.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com >
2014-12-15 17:29:28 +08:00
Jeff Morgan
dd558f6a94
bumping version
2014-12-14 22:49:28 -08:00
Jeff Morgan
630d233799
bumping version
2014-12-14 22:49:28 -08:00
Jeffrey Morgan
14f1f527d1
Merge pull request #140 from kitematic/jmorgan_fix_terminal_spaces
...
Fix bug where terminal button fails if spaces in Kitematic.app path
2014-12-14 22:42:16 -08:00
Jeffrey Morgan
4754fc82b4
Merge pull request #140 from kitematic/jmorgan_fix_terminal_spaces
...
Fix bug where terminal button fails if spaces in Kitematic.app path
2014-12-14 22:42:16 -08:00
Jeff Morgan
b7b212305e
Fix bug where terminal button fails if spaces in Kitematic.app path
2014-12-14 22:41:06 -08:00
Jeff Morgan
88cf79569a
Fix bug where terminal button fails if spaces in Kitematic.app path
2014-12-14 22:41:06 -08:00
Jeffrey Morgan
aaf42470ab
Merge pull request #139 from kitematic/jmorgan_fix_app_image_sync
...
Fixing bugs that occur with sync when containers fail to run
2014-12-14 21:04:21 -08:00
Jeffrey Morgan
9a92f1cf35
Merge pull request #139 from kitematic/jmorgan_fix_app_image_sync
...
Fixing bugs that occur with sync when containers fail to run
2014-12-14 21:04:21 -08:00
Jeff Morgan
9ea3245b57
Fixing bugs that occur with sync when containers fail to run
2014-12-14 21:03:08 -08:00
Jeff Morgan
6ce5da9a78
Fixing bugs that occur with sync when containers fail to run
2014-12-14 21:03:08 -08:00
Sven Dowideit
e4b2f802ae
Merge pull request #9556 from nealmcb/9555-https-no-sudo
...
Fixes #9555 : sudo not needed with cert authn
2014-12-15 15:08:03 +11:00
Alexandr Morozov
4d7359f63d
Remove TestRunExitOnStdinClose
...
Because this is already tested by TestRunExitOnStdinClose in
integration-cli/docker_cli_run_test.go
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-12-14 18:09:41 -08:00
Guillaume Giamarchi
a94dde2b54
Add a Makefile
...
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com >
2014-12-14 22:49:41 +01:00
Alexandr Morozov
70a2b64ef2
Remove TestRunErrorBindNonExistingSource
...
This test tests nothing because of error in cmd, where "echo 'should
fail'" passed as binary. Also this test directly contradicts
documentation and current daemon behavior.
Fixes #7826
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-12-13 21:45:02 -08:00