Commit graph

25682 commits

Author SHA1 Message Date
Vincent Demeester
5347536631 Merge pull request #24245 from cloojure/patch-4
Update network_create.md
2016-07-02 11:32:40 +02:00
Vincent Demeester
59a07f6478 Merge pull request #24254 from thaJeztah/fix-timestamp-capitalization
Improve timestamp formatting
2016-07-02 11:27:49 +02:00
Vincent Demeester
1a0bca56f2 Merge pull request #23977 from Morsicus/master
Update doc remote api (container inpect part)
2016-07-02 11:19:48 +02:00
Mickaël FORTUNATO
166928a24b 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>
2016-07-02 10:58:46 +02:00
Yanqiang Miao
38550d27f8 Modify comment of Makefile
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-02 11:23:03 +08:00
Shourya Sarcar
39dd365c5e 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>
2016-07-02 02:56:03 +00:00
Sebastiaan van Stijn
a26852223e
remove incorrect L3 recommendation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-01 18:13:29 -07:00
Sebastiaan van Stijn
04c94a013c
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>
2016-07-01 17:55:52 -07:00
Sebastiaan van Stijn
212988d68d Merge pull request #24248 from aaronlehmann/swarm-init-docs-fix
Fix --auto-accept documentation
2016-07-01 17:27:19 -07:00
Sebastiaan van Stijn
ac12696ff4
fix typo in "readonly" flag in documentation
the flag is named '--read-only', not '--readonly'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-01 17:08:59 -07:00
Aaron Lehmann
9aed7d1a3d 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>
2016-07-01 16:54:30 -07:00
Tibor Vass
ee9734c631 Merge pull request #24243 from runcom/spec-stop-gap
Fix F24 rpm build
2016-07-01 16:46:12 -07:00
Alan Thompson
68b8cc9735 Update network_create.md
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
2016-07-01 16:16:53 -07:00
Doug Davis
e3c09a848c Merge pull request #24242 from robbyt/patch-1
fixes minor typo in comment
2016-07-01 18:10:24 -04:00
Antonio Murdaca
0c07e55e4c 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>
2016-07-01 23:29:48 +02:00
Robert Terhaar
29fea0fd2e fixes minor typo in comment
Signed-off-by: Robert Terhaar <rterhaar@atlanticdynamic.com>
2016-07-01 17:29:08 -04:00
Tibor Vass
93731a6350 Merge pull request #24230 from mlaventure/vendor-containerd
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
2016-07-01 13:26:28 -07:00
Sebastiaan van Stijn
adb48487f2 Merge pull request #23947 from cpuguy83/fix_mount_target
Volume mounts need to use "Binds" API field
2016-07-01 13:23:14 -07:00
Kenfe-Mickael Laventure
2685c82c2e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-01 11:46:48 -07:00
Kara Alexandra
d0737e9ac0 Add blanks lines in docs for clarity
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
2016-07-01 11:40:22 -07:00
Vincent Demeester
9ba5e0fa72 Merge pull request #24213 from runcom/reference-underlying-error
reference: Do not drop the underlying error message
2016-07-01 19:24:43 +02:00
Sebastiaan van Stijn
691bbeaf44 Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu
add menu.md, make index.md command line reference, update typos/minor…
2016-07-01 10:00:54 -07:00
Vincent Demeester
b898882461 Merge pull request #24128 from thaJeztah/rename-desired_state-filter
rename desired_state filter to desired-state
2016-07-01 18:34:02 +02:00
Sebastiaan van Stijn
b36f068bc5 Merge pull request #24217 from vdemeester/23887-docs
Improve systemd service unit in *Automatically start containers*
2016-07-01 08:02:36 -07:00
Vincent Demeester
48744e03e9
Improve systemd service unit in *Automatically start containers*
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-01 15:19:28 +02:00
Vincent Demeester
75923481d7 Merge pull request #24179 from nicolaka/master
[Docs] added nfs docs
2016-07-01 12:38:57 +02:00
Antonio Murdaca
69dae0a5fb reference: Do not drop the underlying error message
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-01 11:57:43 +02:00
Sebastiaan van Stijn
972c6a7113 Merge pull request #24199 from tonistiigi/update-swarm
Update swarmkit, add support for external ca
2016-07-01 00:50:32 -07:00
allencloud
d2dd1a1f7d add fileutils_darwin.go in pkg/fileutils to support darwin platform
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-01 13:02:26 +08:00
Aaron Lehmann
fa147591ed Add documentation for external CA features in API/CLI
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-06-30 18:08:57 -07:00
Alexander Morozov
2358d5425e Merge pull request #24177 from yongtang/24168-s390x
Fix s390x build failure by removing golang.org/x/sys/unix
2016-06-30 17:38:57 -07:00
Tonis Tiigi
11085b2260 Add support for external CAs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:22:47 -07:00
Tonis Tiigi
9b65273836 Update to new swarmkit/engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:22:47 -07:00
Tonis Tiigi
54255f53d8 Vendor updated swarmkit, libnetwork, engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:21:39 -07:00
Tõnis Tiigi
8fe6480c8a Merge pull request #23584 from nishanttotla/private-images-swarm-services
Passing registry auth token for service create, update
2016-06-30 17:18:59 -07:00
Tonis Tiigi
8b8f86aec9 Mask swarm secrets from daemon logs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:11:09 -07:00
Alexander Morozov
9809446060 Merge pull request #24003 from tonistiigi/fix-duplicate-layers
Fix duplicate layers in exported tar
2016-06-30 17:07:58 -07:00
Sebastiaan van Stijn
50672d1856 Merge pull request #24169 from wenchma/stack-link
Fix docker stack link
2016-06-30 16:54:41 -07:00
Sebastiaan van Stijn
c3e391cc9b Merge pull request #24187 from khudgins/newstorageplugins
Added HPE volume plugin listing to docs
2016-06-30 16:53:46 -07:00
Tõnis Tiigi
a0d068e7c6 Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1
Windows: Skip RunCidFileCleanupIfEmpty on RS1
2016-06-30 16:36:41 -07:00
Tõnis Tiigi
9828960ade Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1
Windows: Skip TestBuildEmptyCmd on RS1
2016-06-30 16:34:55 -07:00
Nishant Totla
538bac39d7
Adding a flag to specify sending of registry auth
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-30 14:59:32 -07:00
Sebastiaan van Stijn
d761719eb4 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>
2016-06-30 14:49:46 -07:00
Charles Smith
f98f596c19 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>
2016-06-30 14:30:11 -07:00
Nicola Kabar
841f985994 [Docs] clarified local volume driver docs
Signed-off-by: Nico <nicolaka@gmail.com>
2016-06-30 14:15:44 -07:00
Tibor Vass
9d18fda08d Merge pull request #24125 from vdemeester/24117-node-task-filter
Fix --filter=desired_state behaviour
2016-06-30 14:08:05 -07:00
Brian Goff
2bc2165cbf 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>
2016-06-30 17:00:52 -04:00
Sebastiaan van Stijn
295a6a37dc Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628
Revert tasksmax workaround to avoid unsupported bins
2016-06-30 13:20:33 -07:00
Alexander Morozov
3926d98394 Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
Prevent CI from getting stuck if shims are left alive
2016-06-30 11:41:41 -07:00
Derek McGowan
8906f8307c Treat digest only images as dangling
Add test for dangling digest images

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-30 11:32:49 -07:00