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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7489ecd35e
Fix pid=host example in documentation
...
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.
This updates the example to use htop (strace is
not working without disabling apparmor for the container)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9b6592ca858a23376b838e9808d7fa3f15ebc381
Component: engine
2016-01-04 16:25:54 +01:00
eee47109fa
Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error
...
Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms
Upstream-commit: 0fff66977a5f4245aedc780acde319a587e945a7
Component: engine
2016-01-04 10:22:10 -05:00
d68e62b901
docs: update configuring docker for systemd
...
Ubuntu 15.04 and above uses systemd. Add a note
in the docs to point users to the right instructions.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59301e018ce7933c86c9874c209802acdb170d69
Component: engine
2016-01-04 15:26:55 +01:00
1162375d21
Merge pull request #15666 from vdemeester/3519-configurable-escape
...
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
2016-01-04 00:49:07 +01:00
5582f5eb83
Implement configurable detach key
...
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration
- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
configure the default escape keys for docker client.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
2016-01-03 23:03:39 +01:00
be7836d63c
Fix race condition in JSONFileLogger.Log
...
Signed-off-by: Ingo Gottwald <in.gottwald@gmail.com >
Upstream-commit: f8c54200805a9b9088c90f0b46bfa848d7bae67c
Component: engine
2016-01-03 22:45:56 +01:00
32d7540e6a
Creating a man page for the configuration file
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding comments. Fixing bit in daemon
Signed-off-by: Mary Anthony <mary@docker.com >
Arrrgggh
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 32b5f71f0d9e997bcbc28cc450b23aa70e445bfa
Component: engine
2016-01-03 13:23:18 -08:00
c32d38aa18
Merge pull request #18387 from wenchma/18385-improve_help_msg
...
Improvement for docker subcommand's help messages
Upstream-commit: 9d6c2196b54a20cef3ede074d521ccb6bdabbe63
Component: engine
2016-01-03 12:19:53 +01:00
d07a95279c
Merge pull request #19035 from albers/completion-authorization-plugins
...
Compute plugin list in bash completion for `docker daemon --authz-plugin`
Upstream-commit: 29da9903d4bccb19a9f26322f031374583f8bf4f
Component: engine
2016-01-02 18:21:19 -08:00
2a9f1ff856
Merge pull request #19036 from calavera/thank_you_ian
...
Thanks for everything Ian.
Upstream-commit: 233787040c6441b8c8eac5bc4802332babf2eb6d
Component: engine
2016-01-02 21:21:03 -05:00
43528a656a
Add Ian Murdock to the names generator.
...
❤️ 😢
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: e11ebfcb0984225690dccc1e644712a80bae2dec
Component: engine
2016-01-02 19:17:17 -05:00
c4ab65d87a
Compute plugin list in bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2134d38935e99a0fa750870e1a509eb2515d104f
Component: engine
2016-01-02 14:53:10 -08:00
da10444c78
Fix declarations of of execdriver/native.NewDriver to have the same signature.
...
This change is done so that driver_unsupported.go and driver_unsupported_nocgo.go
declare the same signature for NewDriver as driver.go.
Fixes #19032
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com >
Upstream-commit: 9a03967f0abae4cc1dca00f339c58c31579c45b5
Component: engine
2016-01-02 19:55:37 +01:00
b09d7888d3
Merge pull request #18891 from HackToday/18872-fix-volume-cmd
...
Fix the restore data example
Upstream-commit: dcbd5e04b79cab9e53f9700a07939f21a3268e6b
Component: engine
2016-01-02 00:43:46 +01:00
8a76cb28e3
Merge pull request #18932 from wenchma/same_name_of_container_image
...
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
02ac964b69
Merge pull request #19028 from AvdN/patch-1
...
fix typo
Upstream-commit: c431bcba5bc8fd01d07d8b394044b22a250bc5b2
Component: engine
2016-01-01 12:26:44 -08:00
