511bd3e7fa
Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a5c7eb607e5cbd46b72e21d2af084e83573688f5
Component: engine
2016-07-03 10:03:53 +02:00
e73e440019
Merge pull request #24251 from thaJeztah/fix-readonly-flag
...
fix typo in "readonly" flag in documentation
Upstream-commit: 3b6bd66cc9f2dcc09f5d4c057770cc28e29dd614
Component: engine
2016-07-02 08:38:16 -07:00
86918cb1e5
Merge pull request #24212 from miaoyq/fix-makefile-comment-err
...
Modify the comment of Makefile
Upstream-commit: 327a69c9b081b92621d5639e41133bd62b27c3b9
Component: engine
2016-07-02 17:04:11 +02:00
d78356d189
Merge pull request #24259 from sarcar/my_add_names
...
Add Andrew Wiles, Florence Nightingale, Thomas Edison to container na…
Upstream-commit: d5f0d80858df778dac00dfc1111cd419677844a3
Component: engine
2016-07-02 16:24:22 +02:00
54e6f114f3
Merge pull request #24245 from cloojure/patch-4
...
Update network_create.md
Upstream-commit: 534753663161334baba06f13b8efa4cad22b5bc5
Component: engine
2016-07-02 11:32:40 +02:00
df80c3b8ed
Merge pull request #24254 from thaJeztah/fix-timestamp-capitalization
...
Improve timestamp formatting
Upstream-commit: 59a07f6478da19fe44294f651ed0de214b53674e
Component: engine
2016-07-02 11:27:49 +02:00
fae991c296
Merge pull request #23977 from Morsicus/master
...
Update doc remote api (container inpect part)
Upstream-commit: 1a0bca56f2734e0c073dbbabd63f0459d6384810
Component: engine
2016-07-02 11:19:48 +02:00
67366b8e43
Update docker_remote_api_v1.22.md
...
Update docker_remote_api_v1.23.md
Update docker_remote_api_v1.24.md
Update docker_remote_api_v1.25.md
look like ExecDriver is not return anymore
Signed-off-by: Mickaël Fortunato <morsi.morsicus@gmail.com >
Upstream-commit: 166928a24bf5f3b23103b8ad09f134e277c00d6a
Component: engine
2016-07-02 10:58:46 +02:00
c419d9316f
Modify comment of Makefile
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 38550d27f86bce3bdeaf22093cde491efa38efc6
Component: engine
2016-07-02 11:23:03 +08:00
92e4ef9b79
Add Andrew Wiles, Florence Nightingale, Thomas Edison to container names.
...
British mathematician Andrew Wiles is notable for solving Fermat's LAst
Theorem. Florence Nightingale was the first female inducted into the
Royal Statistical Society. Thomas Alva Edison was a prolific inventor,
noted for inventing the incandescent light bulb, the phonograph and the
motion picture camera (among many other).
Signed-off-by: Shourya Sarcar <shourya.sarcar@gmail.com >
Upstream-commit: 39dd365c5ef4e69e89353dc4a9af5d852094e471
Component: engine
2016-07-02 02:56:03 +00:00
96e6b59e3f
Improve timestamp formatting
...
lowercase the output, to prevent "About" halfway,
and add "ago" to the output, as timestamps are always
in the past.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 04c94a013ccba1690933156830efdc314de67ef8
Component: engine
2016-07-01 17:55:52 -07:00
ca2f38e06d
Merge pull request #24248 from aaronlehmann/swarm-init-docs-fix
...
Fix --auto-accept documentation
Upstream-commit: 212988d68d1e67362391f0f3f26a6151db548899
Component: engine
2016-07-01 17:27:19 -07:00
7308735be9
fix typo in "readonly" flag in documentation
...
the flag is named '--read-only', not '--readonly'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ac12696ff48aeb115e3d9ce3b13cfa54342b5aee
Component: engine
2016-07-01 17:08:59 -07:00
49ffacf76b
Fix --auto-accept documentation
...
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9aed7d1a3dd7677cbba6b92952a9d28801cf1ceb
Component: engine
2016-07-01 16:54:30 -07:00
b552179d66
Merge pull request #24243 from runcom/spec-stop-gap
...
Fix F24 rpm build
Upstream-commit: ee9734c631ba30c4ebeb9b1fa20ce4501073aad4
Component: engine
2016-07-01 16:46:12 -07:00
c3e3e8c836
Update network_create.md
...
minor typos and punctuation.
Signed-off-by: Alan Thompson <cloojure@gmail.com >
Upstream-commit: 68b8cc9735e9f966dd0e7b3b2d56835310100c2a
Component: engine
2016-07-01 16:16:53 -07:00
d120119e08
Merge pull request #24242 from robbyt/patch-1
...
fixes minor typo in comment
Upstream-commit: e3c09a848c7ceab641df13f437210487a40100f7
Component: engine
2016-07-01 18:10:24 -04:00
59659fc7a0
fix F24 rpm build
...
error: line 89: Invalid version (epoch must be unsigned integer):
%{epoch}:1.12.0-0.3.rc3.fc24: Requires(pre): docker-engine-selinux >=
%%{epoch}:1.12.0-0.3.rc3.fc24
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 0c07e55e4c867ee034c72c7ff8a9b8d63a8ec17d
Component: engine
2016-07-01 23:29:48 +02:00
38e9398cfc
fixes minor typo in comment
...
Signed-off-by: Robert Terhaar <rterhaar@atlanticdynamic.com >
Upstream-commit: 29fea0fd2e9970eb5df0feb0ebef41c5425295f0
Component: engine
2016-07-01 17:29:08 -04:00
33ecd21d8f
Merge pull request #24230 from mlaventure/vendor-containerd
...
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Upstream-commit: 93731a63502c7fa98b5276284ccd4907d418a793
Component: engine
2016-07-01 13:26:28 -07:00
a3ed3e2e3c
Merge pull request #23947 from cpuguy83/fix_mount_target
...
Volume mounts need to use "Binds" API field
Upstream-commit: adb48487f2ec65a9facab04f1ec6c20aefb3e41f
Component: engine
2016-07-01 13:23:14 -07:00
84d90cb333
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d
Component: engine
2016-07-01 11:46:48 -07:00
8105465829
Merge pull request #24213 from runcom/reference-underlying-error
...
reference: Do not drop the underlying error message
Upstream-commit: 9ba5e0fa725e3ffa592473283d9a52213dc09638
Component: engine
2016-07-01 19:24:43 +02:00
9da2bc7d4c
Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu
...
add menu.md, make index.md command line reference, update typos/minor…
Upstream-commit: 691bbeaf4411c56b9f5f19efb54db01c533ab8fc
Component: engine
2016-07-01 10:00:54 -07:00
db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
8a1c0cca14
Merge pull request #24217 from vdemeester/23887-docs
...
Improve systemd service unit in *Automatically start containers*
Upstream-commit: b36f068bc5bd2f26ad4e5d93ce9213403e3e58d1
Component: engine
2016-07-01 08:02:36 -07:00
3c95c21ab6
Improve systemd service unit in *Automatically start containers*
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 48744e03e951c7ab4be180fbf6c1f56108512efa
Component: engine
2016-07-01 15:19:28 +02:00
3b1a7d7ee7
Merge pull request #24179 from nicolaka/master
...
[Docs] added nfs docs
Upstream-commit: 75923481d71e53637b6f889b0aab6e47342b7c86
Component: engine
2016-07-01 12:38:57 +02:00
cd9c4588e1
reference: Do not drop the underlying error message
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 69dae0a5fb4049e045ce0d2424496223d0e2cd0b
Component: engine
2016-07-01 11:57:43 +02:00
86b27dbb73
Merge pull request #24199 from tonistiigi/update-swarm
...
Update swarmkit, add support for external ca
Upstream-commit: 972c6a7113bffc91c6206f13758951acafa2e461
Component: engine
2016-07-01 00:50:32 -07:00
b4d6f25674
Add documentation for external CA features in API/CLI
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4
Component: engine
2016-06-30 18:08:57 -07:00
42cbfed77c
Merge pull request #24177 from yongtang/24168-s390x
...
Fix s390x build failure by removing golang.org/x/sys/unix
Upstream-commit: 2358d5425e02f49e7c05d6370e2a3e9d5033ed8c
Component: engine
2016-06-30 17:38:57 -07:00
bda6fa8f54
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
a4340d91a9
Vendor updated swarmkit, libnetwork, engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 54255f53d8575d50aec4d58869240e01c41dad1b
Component: engine
2016-06-30 17:21:39 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
186c875016
Merge pull request #24003 from tonistiigi/fix-duplicate-layers
...
Fix duplicate layers in exported tar
Upstream-commit: 98094460602130039a8ae576ca2b5a559d1bd274
Component: engine
2016-06-30 17:07:58 -07:00
b9da2674ad
Merge pull request #24169 from wenchma/stack-link
...
Fix docker stack link
Upstream-commit: 50672d18567d060b1e4506c24b8b528067649df1
Component: engine
2016-06-30 16:54:41 -07:00
a166a756ca
Merge pull request #24187 from khudgins/newstorageplugins
...
Added HPE volume plugin listing to docs
Upstream-commit: c3e391cc9b454bac58f47ccc63b8dcee81b0db23
Component: engine
2016-06-30 16:53:46 -07:00
34ed0e262c
Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1
...
Windows: Skip RunCidFileCleanupIfEmpty on RS1
Upstream-commit: a0d068e7c643b489395bb3d4d2f24997cb735a03
Component: engine
2016-06-30 16:36:41 -07:00
cba178dcd2
Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1
...
Windows: Skip TestBuildEmptyCmd on RS1
Upstream-commit: 9828960ade14a49de15d0fbe189a79dd2403dfa4
Component: engine
2016-06-30 16:34:55 -07:00
9f0a770513
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
14e8a9a9a9
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: f98f596c19cb589569ec89bd12d562d8ddd03843
Component: engine
2016-06-30 14:30:11 -07:00
624acb6899
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com >
Upstream-commit: 841f9859944250585b2adf2c9bf2ad5332ccc0bd
Component: engine
2016-06-30 14:15:44 -07:00
c93d8a8a0f
Merge pull request #24125 from vdemeester/24117-node-task-filter
...
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
2cb691411c
Volume mounts need to use "Binds" API field
...
Swarm was putting volume type mounts into the container config's
"Volumes" field, but really these need to go into "Binds".
"Volumes" is only for normal "-v /foo" volumes, not named volumes or
anything else.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2bc2165cbf3e949921d1659f09841b5f008f590d
Component: engine
2016-06-30 17:00:52 -04:00
8b734d8800
Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628
...
Revert tasksmax workaround to avoid unsupported bins
Upstream-commit: 295a6a37dcb5b2671a7df6bd3182c14d79f79ae0
Component: engine
2016-06-30 13:20:33 -07:00
12cfc36ae8
Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
...
Prevent CI from getting stuck if shims are left alive
Upstream-commit: 3926d9839468380e277f445f876b47478d51c07e
Component: engine
2016-06-30 11:41:41 -07:00
6bcf7ca500
Merge pull request #24091 from AkihiroSuda/fixZFS24008
...
zfs: call mount.MakePrivate
Upstream-commit: b8cef7c19cea0f4ee670a9362154716b2313a18f
Component: engine
2016-06-30 11:14:30 -07:00
