Brian Goff
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86
.
Commit caused issues on systems with case-insensitive filesystems.
Revert for now
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-27 21:23:53 -04:00
Sebastiaan van Stijn
b96e076af9
Merge pull request #16017 from flowlo/master
...
docs: Explain volume_name in POST /container Binds
2015-10-27 23:28:47 +01:00
David Calavera
1156b7ff66
Merge pull request #17401 from hugomarisco/patch-1
...
update gpg add key command, without sudo it fails
2015-10-27 15:16:27 -07:00
Brian Goff
1c8ee617d1
Merge pull request #17382 from jecarey/16765-docker_cli_images_test
...
Use of checkers on docker_cli_images_test.go
2015-10-27 17:25:45 -04:00
David Calavera
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
Alexandre Beslic
85ae8b034a
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
David Calavera
82f70677b9
Merge pull request #17405 from LK4D4/cont_pointer
...
Return pointer from newBaseContainer
2015-10-27 13:27:10 -07:00
James Carey
5814d67f98
Use of checkers on docker_cli_images_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-27 15:26:38 -05:00
David Calavera
2b1b7823e6
Merge pull request #17406 from LK4D4/ent_and_args_simple
...
Simplify getEntrypointAndArgs
2015-10-27 13:24:59 -07:00
moxiegirl
bf9f2691ca
Merge pull request #17161 from moxiegirl/commands-network
...
Updating network commands: adding man pages
2015-10-27 13:22:30 -07:00
David Calavera
64854277f8
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
Tibor Vass
194b64951a
Merge pull request #17230 from aboch/ae
...
Do not update etc/hosts file for every container
2015-10-27 16:14:44 -04:00
Vincent Demeester
d5cd032a86
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
David Calavera
eec5e67561
Merge pull request #17408 from jfrazelle/dnf-fedora-builds
...
update dockerfile to use dnf because i hate the warning
2015-10-27 11:04:08 -07:00
Madhu Venugopal
3e7db73b99
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-27 11:03:22 -07:00
Jessica Frazelle
b8891a32d1
update dockerfile to use dnf because i hate the warning
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-27 10:25:39 -07:00
Alexander Morozov
5f6d27ceba
Simplify getEntrypointAndArgs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:36:11 -07:00
Alexander Morozov
6d9bb99c97
Return pointer from newBaseContainer
...
It makes code more consistent.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:05:28 -07:00
Mary Anthony
d5364c7114
Updating network commands: adding man pages
...
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-27 08:29:07 -07:00
Sebastiaan van Stijn
b6fa541877
Merge pull request #17394 from azurezk/doc
...
"docker --log-driver=XXX" in reference missing 'daemon'
2015-10-27 15:41:43 +01:00
Hugo Marisco
7f7953dcc2
update gpg add key command, without sudo it fails
...
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com>
2015-10-27 13:49:52 +00:00
Brian Goff
ebf8ca9a67
Merge pull request #17396 from sdurrheimer/zsh-completion-fix-missing-double-quote
...
Fix missing double quote in zsh completion
2015-10-27 09:19:59 -04:00
Steve Durrheimer
e46445e844
Fix missing double quote in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-27 10:50:45 +01:00
Kun Zhang
9b0d0a64fa
command missing 'daemon'
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-10-27 16:22:09 +08:00
Tibor Vass
b72a431928
Merge pull request #17389 from tonistiigi/15995-duplicate-names
...
Fix duplicate container names conflict
2015-10-27 02:42:50 -04:00
Alessandro Boch
4f6f00e191
Do not update etc/hosts for every container
...
- Only user named containers will be published into
other containers' etc/hosts file.
- Also block linking to containers which are not
connected to the default network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-26 20:08:57 -07:00
Sebastiaan van Stijn
b92fd9ff04
Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking
...
zsh: enable option stacking
2015-10-27 01:39:04 +01:00
David Calavera
91de5ddf18
Merge pull request #17381 from mavenugo/rc3v1
...
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
2015-10-26 17:06:01 -07:00
Tonis Tiigi
aee5486374
Fix duplicate container names conflict
...
While creating multiple containers the second
container could remove the first one from graph
and not produce an error.
Fixes #15995
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-26 16:57:50 -07:00
David Calavera
fe1e04a84f
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
2015-10-26 16:47:51 -07:00
David Calavera
4cbe227db8
Merge pull request #17378 from Microsoft/10662-unmountwithsyscall
...
Windows: Volumes PR rename UnmountWithSyscall
2015-10-26 16:15:00 -07:00
Tibor Vass
3f11360a54
Merge pull request #17384 from mavenugo/42def
...
Simple Info log to indicate the chosen IP Address for the default bridge
2015-10-26 19:11:56 -04:00
Vincent Demeester
bffcb8226e
Merge pull request #17377 from LK4D4/remove_host_integration
...
Remove contrib/host-integration
2015-10-26 23:45:20 +01:00
Vincent Demeester
f3f63c6044
Merge pull request #17257 from echo33/docker_cli_exec_test
...
use of checkers on docker_cli_exec_test.go
2015-10-26 23:14:38 +01:00
Vincent Demeester
0d963de867
Merge pull request #17331 from coolljt0725/fix_redundat_log
...
Better daemon log on docker load
2015-10-26 23:09:00 +01:00
Alexander Morozov
0bd7aedc36
Merge pull request #16772 from Microsoft/10662-refactorresources
...
Windows: Refactor resources structure
2015-10-26 15:01:17 -07:00
Vincent Demeester
962243e387
Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test
...
Use of checkers on docker_cli_config_test.go
2015-10-26 23:00:04 +01:00
Madhu Venugopal
126d1b6ca1
Simple log to indicate the chosen IP Address for the default bridge
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-26 14:46:08 -07:00
Sebastiaan van Stijn
9312a738d8
Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
...
apparmor check version on deb install
2015-10-26 22:44:11 +01:00
Vincent Bernat
402caa94d2
zsh: allow option stacking for short options without arguments
...
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.
Therefore, this behavior is disabled by default. To enable it:
zstyle ':completion:*:*:docker:*' option-stacking yes
zstyle ':completion:*:*:docker-*:*' option-stacking yes
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-10-26 21:58:59 +01:00
Vincent Bernat
8ac32d900a
zsh: allow short options to specify their arguments with "="
...
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-10-26 21:58:59 +01:00
Madhu Venugopal
139d1e13e2
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-26 13:56:56 -07:00
John Howard
b1220a763c
Windows: Refactor resources structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:48:16 -07:00
David Calavera
2dd822f322
Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test
...
Use of checkers on docker_cli_import_test.go
2015-10-26 13:42:02 -07:00
David Calavera
e252fe288c
Merge pull request #17266 from cpuguy83/dump_http_request_on_debug
...
Dump request when daemon is set to debug
2015-10-26 13:41:14 -07:00
John Howard
853f2e9952
Windows: Volumes PR fix one of Tibors nits
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:34:49 -07:00
Michael Crosby
8173acca95
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
2015-10-26 13:33:59 -07:00
Michael Crosby
5cf028d3dd
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
2015-10-26 13:32:32 -07:00
David Calavera
c52fdce2f2
Merge pull request #17286 from FeroVolar/namegenerator
...
Add Heyrovsky
2015-10-26 13:26:43 -07:00
David Calavera
1b9d064b73
Merge pull request #17376 from LK4D4/fix_dumper
...
Fix dumper program to use proper import
2015-10-26 13:25:36 -07:00