Sven Dowideit
9c47f4a11e
Merge pull request #8683 from cpuguy83/fix_api_docs
...
Bring API docs inline with 1.3
Upstream-commit: 56261daf32a1c5490ce0b5b500bf4245b6ac63bd
Component: engine
2014-11-05 16:34:27 -08:00
Fred Lifton
d833712ff9
Merge pull request #8874 from whoshuu/patch-1
...
Fix apparent copy paste mistake
Upstream-commit: f10fefe408d2b6b40191d802c5244ea6379954f9
Component: engine
2014-11-05 12:24:53 -08:00
Brian Goff
412668aa98
Bring API docs inline with 1.3
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e86223e7b3ea7766164d809d2fbd463870e0614a
Component: engine
2014-11-05 09:38:44 -05:00
Alexandr Morozov
1ce2377d8b
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
Upstream-commit: 9eb8fcd58a5dc0a6fd812fc2bdc410f36dd63cc0
Component: engine
2014-11-04 07:54:59 -08:00
Malte Janduda
d1a9c32b50
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 28605bc4d55bcfc7a5562e4de3e01b1d5cd9bdcd
Component: engine
2014-11-04 15:19:47 +01:00
Sven Dowideit
8be6c529c8
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
Upstream-commit: b68d7d39bcd96744eec883bb305e907c10fe6aa6
Component: engine
2014-11-03 23:09:16 -08:00
Peter Ericson
299f6b0aa6
Fix typo in api docs: stdou -> stdout
...
Upstream-commit: 4437573c96cdc52e98f44356be5c96dff4ce5907
Component: engine
2014-11-03 10:52:50 +00:00
Malte Janduda and Malte Janduda
590a54ca61
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
2014-11-03 11:43:27 +01:00
Arnaud Porterie
3856bb0808
Clarify USER instruction documentation
...
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: de9bf24750e0a9774a475eae74cbd2c241224e10
Component: engine
2014-11-01 14:04:51 -07:00
Malte Janduda
c0897a4514
Adding docker-cli run param to set MAC address
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
2014-11-01 15:35:09 +01:00
Jessie Frazelle
3613ec484c
Merge pull request #8167 from brahmaroutu/expose_ports_1834
...
adding support for port ranges on --expose
Upstream-commit: 92bb49720199918b808bcb7544b69f16e3d45c49
Component: engine
2014-10-31 16:20:08 -07:00
Srini Brahmaroutu
b972337ce2
adding support for port ranges on --expose
...
Closes #1834
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: fd774a818c7d8942922b4f74eabd2a4e14094e1a
Component: engine
2014-10-31 23:06:30 +00:00
Michael Crosby
e50667ec3a
Merge pull request #8818 from coolljt0725/fix_exec_help
...
Fix docker exec help messages.
Upstream-commit: 7cb12133ae362055ff51d1ea5f71ad9cef6b2fae
Component: engine
2014-10-31 14:36:01 -07:00
Jessie Frazelle
214986ab4e
Merge pull request #8894 from vieux/fix_docs_filter
...
add missing 'current filter' to ps
Upstream-commit: 058aa0cbc2f1f85cf777138761389f9bb4af6584
Component: engine
2014-10-31 14:26:29 -07:00
Victor Vieux
287b15d7a3
add missing 'current filter' to ps
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f95d73dfd48ad4a3211f2f5e89e8195e2066c939
Component: engine
2014-10-31 18:28:10 +00:00
Michael Crosby
e8cb0ca4b5
Merge pull request #8839 from irachex/dns-search-doc
...
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
2014-10-31 11:25:57 -07:00
Huu Nguyen and Huu Nguyen
a8e1069f16
Fix apparent copy paste mistake
...
The note under the RUN header refers to the CMD instruction. It should refer to the RUN instruction instead.
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: b16f3736edf2427761cbc1c8fc5c4892299b2232
Component: engine
2014-10-30 23:22:51 -04:00
Huayi Zhang
c33ebe12c4
Mapping change in code
...
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: eaa050fdb8fed612b3cd5d204fddaedf27a20370
Component: engine
2014-10-31 09:57:54 +08:00
Lei Jitang
4454d2b409
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
2014-10-31 09:36:07 +08:00
Tibor Vass
fce9329c80
Docs edits for dropping SSLv3 and under + release notes for 1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/index.md
Conflicts:
docs/sources/index.md
Upstream-commit: e43d9f713e96daed521034995c00375544f62827
Component: engine
2014-10-30 19:44:42 -04:00
Tibor Vass
6d16ddef35
Do not verify certificate when using --insecure-registry on an HTTPS registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry.go
registry/registry_test.go
registry/service.go
registry/session.go
Conflicts:
registry/endpoint.go
registry/registry.go
Upstream-commit: 6a1ff022b0744213ed588d9c16dbb13ce055eda6
Component: engine
2014-10-30 19:44:09 -04:00
Michael Crosby and Tibor Vass
3def82482e
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 48f7384d6365c59b4b61d527630aaf88af24f6dd
Component: engine
2014-10-30 19:41:55 -04:00
unclejack and Tibor Vass
6b54bde512
make http usage for registry explicit
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
daemon/config.go
daemon/daemon.go
graph/pull.go
graph/push.go
graph/tags.go
registry/registry.go
registry/service.go
Upstream-commit: 380c8320a78dc16da65d9d13004422ac5a0cca53
Component: engine
2014-10-30 19:41:55 -04:00
Huayi Zhang
3a00799059
Add docs for --dns-search=.
...
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: 36ffbd7acf60d15942c0591bb4fec498f021331e
Component: engine
2014-10-30 21:04:35 +08:00
Sven Dowideit
1b7aca4d0a
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
Upstream-commit: 90221e28d61ed2a71ebbc8160d60156b8145dc43
Component: engine
2014-10-28 19:08:55 -07:00
James Turnbull
025009b453
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
Upstream-commit: 01454a50cc3fe2bd5a86befa69427dc2bbaa604e
Component: engine
2014-10-28 22:04:23 -04:00
Jessie Frazelle
ec0d91155f
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
Erik Hollensbe
57b27c44c9
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: e377716b377ccc4854f810bbfc3e65a7858163ed
Component: engine
2014-10-27 23:37:27 +00:00
Andrea Luzzardi
e6c9b85c85
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
James Turnbull
65068e254b
Merge pull request #8746 from aluzzardi/bump-api-v1.16
...
Bump API to v1.16.
Upstream-commit: 78075abf81c45bfca16604919136eae99a2d7bff
Component: engine
2014-10-24 16:47:48 -04:00
Fred Lifton
20fbd71b3d
Tweaks to Dockerfile tutorial
...
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: cc45b13ad4e4384f016764c15a52eda95eb548a4
Component: engine
2014-10-24 12:00:47 -07:00
Andrea Luzzardi
82b5bee9bb
Bump API to v1.16.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
Nicolas De loof
4391a7b5ae
Document alternate command to check encrypted TCP socket
...
as curl command seems to fail on OSX Mavericks
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: ab03e898ff22e1bdb2452cfc2d9aad1313c97fc9
Component: engine
2014-10-24 09:15:15 +02:00
Sven Dowideit
4761e6734e
Rewrite ENTRYPOINT documentation covering all the combinations with examples.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 0390d04d8a236c427f553ead4328f6b4947a61ef
Component: engine
2014-10-23 12:12:08 +10:00
Torstein Husebø
cb88e66803
Correct url from github.com/dotcloud/docker{,-py}
...
to github.com/docker/docker{,-py}
Signed-off-by: Torstein Husebø <torstein@huseboe.net >
Upstream-commit: 64cb7725381740986022eb4633c8f91be3dd7b4f
Component: engine
2014-10-22 16:57:39 +02:00
Sven Dowideit
a67bf902c4
Link to run reference from cli doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 9e137ceb578bd427124d4937bc6e440ae5267bf6
Component: engine
2014-10-21 11:21:11 +10:00
Madhu Venugopal
38ac7b23be
Fixed a minor docs issue in a Dockerfile Example
...
The Dockerfile Instruction to create the .vnc directory results in a failure :
-storepasswd failed for file: /root/.vnc/passwd
Signed-off-by: Madhu Venugopal <madhu@socketplane.io >
Upstream-commit: 18141652ba4654458e0cd78dbabe6fc6cc1729ee
Component: engine
2014-10-19 10:16:30 -07:00
James Turnbull
beee7faafb
Merge pull request #8614 from ryanrdetzel/master
...
exec docs syntax fix
Upstream-commit: 04932e38afa78441e60ba6b86021a61a70e4692c
Component: engine
2014-10-17 14:38:43 -04:00
Fred Lifton
f3d73e7359
Merge pull request #8531 from SvenDowideit/move-registry-search-to-registry-api
...
Move registry search API docs into the registry API document.
Upstream-commit: 6ce4f82ebe822dbc3cf945abba5f8a09ca48ea9f
Component: engine
2014-10-16 18:27:37 -07:00
Sven Dowideit
180b93af0b
Merge pull request #8599 from irachex/commit_docs
...
Fix commit api document
Upstream-commit: 62cb97278d1ff35a13a09cc845c64d6a417f5874
Component: engine
2014-10-16 16:10:49 -07:00
Michael Crosby
fcf584741e
Merge pull request #8465 from SvenDowideit/document-device-flag-permission-options
...
Add info on --device flag permissions ':rwm'
Upstream-commit: 4b594721c409318040d691d2dc1a58dbbab888b5
Component: engine
2014-10-16 14:00:09 -07:00
Ryan Detzel
43742710a1
Docs syntax fix
...
the flags must come before the container name.
Upstream-commit: b8b9930a8ab95cfe32731e014a57690f154d01fa
Component: engine
2014-10-16 15:57:38 -04:00
Huayi Zhang
f5e599aefb
Fix commit api document
...
The commit message field should be `comment`, not `m`
https://github.com/docker/docker/blob/master/api/server/server.go#L478
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: f6140060e3b7fc8e6f577ca95be0eb5bf8cd1fd4
Component: engine
2014-10-16 18:10:58 +08:00
Fred Lifton
b0a547e200
Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page
...
The basics page moved, update link.
Upstream-commit: 73792969e62bed273dc8aca609d513e80856807a
Component: engine
2014-10-15 11:34:25 -07:00
Sven Dowideit
eb924a4c12
Add a little info on how to talk to the TLS encrypted Docker Socket
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
2014-10-15 17:24:53 +10:00
Sven Dowideit
256f3dd5a2
The basics page moved, update link.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a64ff0bf7a8c69e5698dc7e757d4ac56dd91b738
Component: engine
2014-10-15 16:48:43 +10:00
SvenDowideit and Sven Dowideit
65957340a9
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
...
Add some information about the storage and execution driver choices
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5bcff59febc1ac798d735b52cc4e92db1ab41bd9
Component: engine
2014-10-14 12:05:09 +10:00
Sven Dowideit
05808ba39b
Move registry search API docs into the registry API document.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 6b285c4cd6fe4a28c73a7137fe47753510befd3f
Component: engine
2014-10-14 11:53:10 +10:00
Fred Lifton
304a5b7a01
Merge pull request #8517 from sequenceiq/master
...
docs: fixing docker.io api
Upstream-commit: 6ce3967f8f5fdcd1ae2b1bdaba483ed9654e6f29
Component: engine
2014-10-13 12:09:39 -07:00
Fred Lifton
33f3f70f42
Merge pull request #8503 from aanand/tlsverify-environment-variable
...
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
Upstream-commit: ce669297df2981214c5d01e54c358347c5852ef7
Component: engine
2014-10-13 10:20:10 -07:00