Commit Graph
21050 Commits
Author SHA1 Message Date
David Calavera e6d64cf7a3 Merge pull request #18977 from anusha-ragunathan/builder
Use ImageBuildOptions in builder.
Upstream-commit: acfd5eb947bff31239701e754814787e92e1d17f
Component: engine
2016-01-05 11:54:21 -08:00
Sebastiaan van Stijn d708725a46 Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop
Windows CI: No integration daemon stop
Upstream-commit: 2b489450d7abc56301e48f11bc6dabb878d7e585
Component: engine
2016-01-05 20:52:51 +01:00
Vincent Demeester 6dbbe91963 Merge pull request #19097 from albers/completion-daemon--cgroup-parent
bash completion for `docker daemon --cgroup-parent`
Upstream-commit: 4f8d794c46109547ecbfaf60e57208af7094722e
Component: engine
2016-01-05 19:56:51 +01:00
moxiegirl caf108c7a2 Merge pull request #19045 from wenchma/network_api_update
Update docker network api doc
Upstream-commit: 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117
Component: engine
2016-01-05 10:55:56 -08:00
John Howard cf47068ecd Windows CI: No integration daemon stop
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3858873fa87ff5b209e89e70d127d822efc42a6
Component: engine
2016-01-05 10:52:59 -08:00
David Calavera c150e2d2f0 Merge pull request #19067 from jfrazelle/19029-volume-name
update volume name regex
Upstream-commit: 97bed96759678c3611a6cacb533783b0f55fa67b
Component: engine
2016-01-05 10:50:46 -08:00
David Calavera 681245c6b9 Merge pull request #19094 from ReadmeCritic/master
Update README URLs based on HTTP redirects  
Upstream-commit: 50917521fc64e53b6969bbcffb1e02d28b689cce
Component: engine
2016-01-05 10:46:21 -08:00
David Calavera 97fa207a24 Merge pull request #19098 from albers/completion--isolation
bash completion for `--isolation`
Upstream-commit: 9819a9db208633c511167d42407e4e53f22e4aef
Component: engine
2016-01-05 10:37:39 -08:00
Michael Crosby 966533e9d7 Merge pull request #18399 from tonistiigi/migration-optimization
Migration optimizations
Upstream-commit: 5aae5a5fae39cff15f5e92cfe1f80c1c5ef019d9
Component: engine
2016-01-05 10:11:56 -08:00
Anusha Ragunathan f688b73835 Use ImageBuildOptions in builder.
dockerfile.Config is almost redundant with ImageBuildOptions.
Unify the two so that the latter can be removed. This also
helps build's API endpoint code to be less dependent on package
dockerfile.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5190794f1d85d5406611eb69c270df62ac1cdc7f
Component: engine
2016-01-05 10:09:34 -08:00
Harald Albers 8e3f31a35d bash completion for --isolation
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9e624d32500e8e1894558e6dedccad5539345ed0
Component: engine
2016-01-05 09:59:29 -08:00
Harald Albers 31535b0034 bash completion for docker daemon --cgroup-parent
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ce2cbde8414380bc6e1e3040acb2c1c7b4c157a8
Component: engine
2016-01-05 09:29:37 -08:00
Tianon Gravi 472e1b020d Merge pull request #19084 from vdemeester/i-am-all-frozen
Remove hello-world:latest tag before integration
Upstream-commit: d5685a65d7fb2a4004c941995809931c840c26b6
Component: engine
2016-01-05 09:26:59 -08:00
Jess Frazelle 95064fe12f Merge pull request #18751 from clnperez/update-gcc-to-5.3
Update gcc to 5.3
Upstream-commit: fd1afe1d59df14e27cdd2d932872fa5c68c8b2dc
Component: engine
2016-01-05 09:15:41 -08:00
moxiegirl 7f8bab011e Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes
docs: add note to volume-plugins
Upstream-commit: f67fed5f77f868dc2550cc7267fb454cae2108b3
Component: engine
2016-01-05 09:15:21 -08:00
ReadmeCritic 7f889fdbaa Update README URLs based on HTTP redirects
Signed-off-by: d. khamsing <dkhamsing8@gmail.com>
Upstream-commit: 85599338db90c2ccedcbc9a3855db2ae60cb557a
Component: engine
2016-01-05 09:13:45 -08:00
Doug Davis 8cbc6b466a Merge pull request #19038 from gottwald/logfix
Fix race condition in JSONFileLogger.Log
Upstream-commit: b2d00e312b23b9942a1db2ccf6b56288ac3bc57d
Component: engine
2016-01-05 08:52:12 -05:00
Vincent Demeester 907be2c8ba Remove hello-world:latest tag before integration
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0736598b93d7bc94b376c61ada17658dddee9aa3
Component: engine
2016-01-05 14:40:27 +01:00
Vincent Demeester ba6c4901c7 Merge pull request #19070 from softprops/shiplift_client
add shiplift docker client to remote api client list
Upstream-commit: 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d
Component: engine
2016-01-05 14:36:30 +01:00
softprops 738f0e36b5 add shiplift docker client to remote api client list
Signed-off-by: Doug Tangren <d.tangren@gmail.com>
Upstream-commit: 09e0c9fc24db44217885c58fb6023bcfef211ae0
Component: engine
2016-01-05 08:27:26 -05:00
Sebastiaan van Stijn c69ee1ec9e Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent
Add zsh completion for 'docker daemon --cgroup-parent'
Upstream-commit: 0439e03a2720987785f98496867c20fd71b9fa44
Component: engine
2016-01-05 13:12:02 +01:00
Sebastiaan van Stijn 609d075f70 Merge pull request #19075 from HackToday/fixvoldoc
Fix the unnecessary parameter
Upstream-commit: 4a4131ac1b5ca28a06802d4e904bc99afa721d1f
Component: engine
2016-01-05 11:51:33 +01:00
Sebastiaan van Stijn 23281e4aa3 Merge pull request #19064 from RichardScothern/registry-flag
Show the legacy registry flag only in the daemon arguments
Upstream-commit: 14a7048df9234608f36b47183fae00ecb46b7e1f
Component: engine
2016-01-05 11:48:01 +01:00
Vincent Demeester 17d5fbd66c Merge pull request #19078 from HackToday/19072-fix-str
Fix the str missing
Upstream-commit: fccbbe572607999dc147bf9dfc06dac0ba4ee25c
Component: engine
2016-01-05 11:34:36 +01:00
Kai Qiang Wu(Kennan) d4f5e05d82 Fix the unnecessary parameter
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 52b944dbba74b7d2be5bcabfe6937a5578020101
Component: engine
2016-01-05 10:26:01 +00:00
Sebastiaan van Stijn 658f3a4fa1 Merge pull request #19079 from wenchma/typo_error
Fix a typo error
Upstream-commit: cd9c641b1d00e10bddec14ad7f88e2476e55f3c1
Component: engine
2016-01-05 11:06:30 +01:00
Wen Cheng Ma 722bb40262 Fix a typo error
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 289faeac111486f19537a06166f283e73fa44c4b
Component: engine
2016-01-05 17:42:13 +08:00
Kai Qiang Wu(Kennan) 8584ddc8d5 Fix the str missing
Fixes: #19072
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 01e873790e587ebbee761b1f52871901c89c0fc4
Component: engine
2016-01-05 09:32:52 +00:00
Steve Durrheimer 4ef509bcec Add zsh completion for 'docker daemon --cgroup-parent'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b5f6605ca20918c9462aad891d4ca2d541d5949e
Component: engine
2016-01-05 07:41:34 +01:00
David Calavera 26e3049dda Merge pull request #19062 from anusha-ragunathan/cgroup
Add ability to set cgroup parent for all containers
Upstream-commit: ebc5a4654eb560b8e1f277e8b041635ce18d5ddd
Component: engine
2016-01-04 16:46:23 -08:00
Jess Frazelle 16edb9ca77 Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
Adding Jenkins CI script to sources
Upstream-commit: 78873dd6e57c142ab286a0822a5d61491ac8d383
Component: engine
2016-01-04 15:59:03 -08:00
John Howard 1a2c2c2776 Adding Jenkins CI script to sources
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8213f8caaaebbe1627a8efc5b4aac8511f2da9aa
Component: engine
2016-01-04 15:53:30 -08:00
Alexander Morozov 0c89fbf389 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
Jessica Frazelle 26657d68aa update volume name regex
Disallow creating a volume starting with a /.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b46f044bf71309088b30c1172d4c69287c6a99df
Component: engine
2016-01-04 15:00:49 -08:00
Richard Scothern ffe759f6e1 Show the legacy registry flag only in the daemon arguments
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: b18fadd115f1c9dcbe5bd49636f82d0993067672
Component: engine
2016-01-04 14:52:39 -08:00
Michael Crosby 89d18d78c9 Merge pull request #18208 from cpuguy83/restart_links
Daemon Restart: attempt to wait for container deps
Upstream-commit: 04234bd16a463af3b5e093ef180351d7b54b6a35
Component: engine
2016-01-04 14:36:00 -08:00
David Calavera 58e545b6bf Merge pull request #18888 from calavera/event_types
Event all the things!
Upstream-commit: 723be0a3325799fd6b2a6b689af54f5a07edf992
Component: engine
2016-01-04 13:07:33 -08:00
David Calavera c2e5fdc393 Add filter by event type and documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 851fe00c64ffafeb27b12f7b0ed8e41f7720b477
Component: engine
2016-01-04 14:58:04 -05:00
David Calavera 98eaf4874e Merge pull request #18941 from dnephin/runconfig_in_cli
Move runconfig/parse.go into the runconfig/opts package
Upstream-commit: dc4ca0e89785a93faffeb8736dcb14e3e1769ae8
Component: engine
2016-01-04 11:06:18 -08:00
David Calavera 8b7715407a Merge pull request #19054 from calavera/remove_version_from_types
Remove version package from API types.
Upstream-commit: 972653c310a400a26b8c618288b2c0a328af4c5e
Component: engine
2016-01-04 10:54:47 -08:00
Jess Frazelle 65930d6983 Merge pull request #19002 from jfrazelle/update-test-images
cleanup test images
Upstream-commit: fa57eedff409edb7a4ad926b365213a944a97954
Component: engine
2016-01-04 10:24:30 -08:00
David Calavera 5b8857958e Remove version package from API types.
It's an internal type that only extends string.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9961816adead89622f5d4201a0b5cb33845fa852
Component: engine
2016-01-04 12:51:45 -05:00
Tonis Tiigi b5e71315d4 Parallel migration and optimizations
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a8f88ef4036d22aa1feb1de8e86d92371bcd5b67
Component: engine
2016-01-04 09:48:52 -08:00
Tonis Tiigi eb346ff358 Use direct filesystem access for tar-split on aufs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0641429ad8a474c25eb99ee3c5a969b28baaad21
Component: engine
2016-01-04 09:41:02 -08:00
Sebastiaan van Stijn fc0ab04968 docs: add note to volume-plugins
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb893cf6568f2b0cdf500bc3ecfb231fd374ffac
Component: engine
2016-01-04 18:28:14 +01:00
Daniel Nephin 7bea2a5a61 Move volume.SplitN() to the one place it is used in runconfig.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c5a2fdb697e403af228a68d08c68d17d347f6cf3
Component: engine
2016-01-04 12:06:30 -05:00
Daniel Nephin c43ba74b61 Move the runconfig.Parse() function into the runconfig/opts package.
The parse.go file is used almost exclusively in the client. The few small
functions that are used outside of the client could easily be copied out
when the client is extracted, allowing this runconfig/opts package to
move to the client.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2b7ad47bd2649c3f164e8b57b31fae313045c8f4
Component: engine
2016-01-04 12:06:29 -05:00
Daniel Nephin 29d22b9aad Move ParseExec to the client where it is used.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c0d586bd3a1b81cfba78af89af02be56041bc6b
Component: engine
2016-01-04 12:06:29 -05:00
moxiegirl b1b6046ba2 Merge pull request #18499 from thaJeztah/fix-run-reference-example
Fix pid=host example in documentation
Upstream-commit: 0fae65e228d29c8f8dd25e29a61eaa0922e13d1d
Component: engine
2016-01-04 08:51:02 -08:00
moxiegirl fff1179c45 Merge pull request #19048 from thaJeztah/update-configuring-docker
docs: update configuring docker for systemd
Upstream-commit: 822a80868801966f2a6664cdc3c9365a0536dc63
Component: engine
2016-01-04 08:46:45 -08:00