16bdc5c32b
Merge pull request #7741 from LK4D4/bump_docs_to_1.15
...
Bump docs and api to 1.15
Upstream-commit: 4fe6115fb125d5acddec328e2dcfb23b6fe61ffa
Component: engine
2014-08-26 13:44:05 -07:00
b22bbbc6cc
Bump docs and api to 1.15
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
2014-08-26 13:08:50 +04:00
73e4ee940c
Fix the other API docs to use an array of key/values
...
as per #7706
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: b0edced87f2a9bd2e85b0a59f6a6c83aff36e445
Component: engine
2014-08-26 11:36:25 +10:00
db566d8d04
Updating LxcConf to match Docker command line
...
I've changed LxcConf on a previous API document. Not sure why it keeps getting changed back. I'm seeing Docker 1.2.0 command-line calls are still using the array of key/values.
Docker-DCO-1.1-Signed-off-by: getvictor <victor@victoreda.com > (github: SvenDowideit)
Upstream-commit: 216ab880f96125566f2816510ba9d396dcf103f0
Component: engine
2014-08-26 11:36:25 +10:00
1dae3fa4de
Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: fcad8ee83a2cf9192ba4f9ec7d5c1d0b03a6aa47
Component: engine
2014-08-26 11:10:09 +10:00
bd4553339f
Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel
...
Ubuntu backported kernel
Upstream-commit: 849086d3d965cea7d7e04b3559edc9c903e30ba6
Component: engine
2014-08-25 17:16:34 -07:00
cd586bd31e
small word change
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 93d574298da0f420c19db52b75ebf31ed3cb2ec9
Component: engine
2014-08-26 10:15:12 +10:00
a3c910b1d1
Merge pull request #7603 from kuon/centos7
...
Added manual installation instruction for Centos7 and note about firewalld.
Upstream-commit: 97c7b0115b62a698123eec1b2548ff85937ba35a
Component: engine
2014-08-25 16:49:09 -07:00
4d0ceee016
Merge pull request #7574 from crosbymichael/update-restart-docs
...
Update flag usages and docs for max restart count
Upstream-commit: b0abd6de635e3bac9c6aa40aa98f53a5d9e15f98
Component: engine
2014-08-25 16:26:06 -07:00
3af44a7cdf
Added manual installation instruction for Centos7.
...
Added a note about firewalld.
Signed-off-by: Nicolas Goy <kuon@goyman.com >
Upstream-commit: d4a53a7bce0205ba0cb693b43091b78f6ce8702a
Component: engine
2014-08-25 04:00:11 +02:00
be7fbe7b1d
Removed deprecated release notes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: df38eb4d43b03728253593622fe4285e99d0784f
Component: engine
2014-08-23 20:01:41 -04:00
5b6d059957
Update usingdocker.md
...
Minor rewording and removal of unnecessary apostrophe.
Upstream-commit: fe845c4da88ef15baf45fa600a077a75f3634c40
Component: engine
2014-08-22 17:48:26 +01:00
b6a88dc489
Clean up typos in hub_registry_spec.md
...
Couple of instances of incorrect articles (e.g. "an Docker Hub").
Upstream-commit: c87d9a1de62678743436887edecdbde2e5a67a1a
Component: engine
2014-08-21 11:04:25 -07:00
3228a8d12a
Add link to Ubuntu notes about LTSEnablementStack
...
When running Ubuntu with a graphical environment, the kernel version MUST match the Xorg version. Only installing the suggested packages above breaks Unity for anything other than 2D mode (in VMware and probably native).
Signed-off-by: Ethan Spoelstra <ewspoelstra@computerphreaks.com >
Upstream-commit: 27f44b9bb162dce988913b981f1f21eb149d875f
Component: engine
2014-08-20 22:23:34 -05:00
b642305530
Merge pull request #7634 from krrg/patch-1
...
Update openSUSE installation instructions
Upstream-commit: 997336fd95270a35b0dc8cc17aa969fd8c2e6f81
Component: engine
2014-08-20 14:46:41 -04:00
0186e144d0
Merge pull request #5129 from vieux/host_resolv
...
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
Upstream-commit: 94fbcea7a305e9810f3f6349fe9a778c90a25993
Component: engine
2014-08-20 11:02:36 -05:00
55a0a050b4
Merge pull request #7633 from fredlf/root_builder_warning
...
Added warning re: using root for dockerfile root. Fixes #7612
Upstream-commit: 494bea9fba229dd388d8912fe72936af4a54f73b
Component: engine
2014-08-20 08:02:38 -04:00
a4c03cd9ac
Merge pull request #7635 from bfirsh/docs-https-newsletter-url
...
Use HTTPS for newsletter signup form
Upstream-commit: 0d26b7cc6d9c5625e5cdc483db90d9ae1228209c
Component: engine
2014-08-20 08:01:27 -04:00
46c8de1eaa
Cleanup: correct cli --volumes-from description
...
issue #7580 volumes-from comma separated list mentioned this case.
Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash
Signed-off-by: Deshi Xiao <dxiao@redhat.com >
Upstream-commit: 4d0b88c52f896fe159fe2b1dfd7bdb8116c31da3
Component: engine
2014-08-20 16:31:04 +08:00
4300ef9d0c
Fixed a typo and added a bit based on Sven's feedback
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 98dd982586ed9fd99853001d4a27503180e432c4
Component: engine
2014-08-19 17:22:11 -07:00
3cb90fd37e
Use HTTPS for newsletter signup form
...
This is causing an insecure HTTPS error in Chrome 37.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 8c7915fcded75128dab9724782baebb17fbcd9f4
Component: engine
2014-08-19 15:39:37 -07:00
4d8152bd50
Update openSUSE installation instructions
...
Out of box, the 'sudo' command on openSUSE does not work similarly to other distros. In this case, the path to usermod should be explicitly given, since /usr/sbin, where usermod is located, is not on the sudoing user's PATH. The other sudo commands here should be fine.
Upstream-commit: 05a09675c31c7de7f8f21bdd13ad7adb548804de
Component: engine
2014-08-19 16:03:51 -06:00
f066236203
Added warning re: using root for dockerfile root. Fixes #7612
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: b63c10558e6fe187d9cee25a4d8bad4bffd7f79b
Component: engine
2014-08-19 13:39:50 -07:00
03f9c00b29
Merge pull request #7604 from SvenDowideit/docs-update
...
update the cli / man page docs based on what is in master right now
Upstream-commit: abc134677740803ea2e854ae0e87cfa4cfbd202a
Component: engine
2014-08-19 10:12:50 -07:00
09240bd768
add small doc
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 26feb09fac7cfcafef36cc71df1176301c70eb53
Component: engine
2014-08-19 17:06:17 +00:00
b71571fd04
Fixes "note" blockquote too long [doc, minor]
...
A "note" block includes too much text, so if you skip over it the next paragraph makes zero sense.
Upstream-commit: 99082de9ada13a5898e769c176a88488d310b1a4
Component: engine
2014-08-18 15:31:37 -04:00
43acaaf00e
update the cli / man page docs based on what is in master right now
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 018e75a6e4ef955cd802267818b6a6c81a600c9a
Component: engine
2014-08-18 09:31:58 +10:00
397a4ab41c
Merge pull request #7581 from samuel-phan/patch-1
...
Update docker-attach.1.md
Upstream-commit: d1fc32e265c57d78dcbfd1ddf2d272c1ebd27c8b
Component: engine
2014-08-14 18:36:23 -07:00
1aae74c809
Merge pull request #7562 from jperrin/master
...
Updated CentOS documentation to reflect CentOS 7 install.
Upstream-commit: 31bd4a19c9e88ac450495c0cb4dd594b7cc4be9f
Component: engine
2014-08-14 18:32:05 -07:00
399d98c0d7
Merge pull request #7546 from hollietealok/master
...
Added fredlf's suggested changes.
Upstream-commit: 4bcc7e283f4191d2505bc87c2eaa5a38cb15b356
Component: engine
2014-08-14 18:27:50 -07:00
c395d23539
Merge pull request #7126 from ostezer/update-certificates
...
Docs: articles/certificates.md rewrite.
Upstream-commit: 17112704b99405aa642df37d5c8b7e369dd0b4ab
Component: engine
2014-08-14 08:52:08 -04:00
974ae2755d
Update docker-attach.1.md
...
Upstream-commit: 5073554ca67f7f1f3f21d87cab766708556486c2
Component: engine
2014-08-14 14:20:38 +02:00
d5f518ec2f
Merge pull request #7532 from ChristopherBiscardi/shiftWindow
...
Remove Old shiftWindow()
Upstream-commit: f945edb3e0ae42645f1f52026edbf0869044379d
Component: engine
2014-08-14 12:48:19 +10:00
99933d1110
Update flag usages and docs for max restart count
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 5ad4879d2a5ee5af95c8b8ab701a621c8b49609a
Component: engine
2014-08-13 18:24:33 -07:00
7b00009aba
Updated CentOS documentation to reflect CentOS 7 install.
...
Added reference to CentOS Dockerfiles on github.
Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jperrin)
Upstream-commit: d939fe758affe15f5054216f6e594eae386adca3
Component: engine
2014-08-13 19:06:53 -05:00
9b55fc0736
Deprecate --restart on the daemon
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
2014-08-13 16:08:50 -07:00
623a65a209
Update docs based on feedback from review for --restart
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 617edd89f48a7082bf4ec1d28ec12eefd1057a2f
Component: engine
2014-08-13 15:57:37 -07:00
ed9f19284d
Add documentation and update restart rules.
...
Implement time backed backoff for restarting and fix failure count when
the maximum is 0
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 860c13b788944410a98a6ad5b5cfb74de0a8405b
Component: engine
2014-08-13 15:57:37 -07:00
fc0d245526
Move remote API config out of daemon/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 1d10c55aec891df609d36c90ee6c30adb24c16c4
Component: engine
2014-08-13 19:25:51 +00:00
779c425729
Merge pull request #6162 from vbatts/vbatts-ps_filter
...
docker ps: introducing filters
Upstream-commit: c9c271858a652583ba548cb2ea75df68b51a9dd3
Component: engine
2014-08-13 11:44:48 -07:00
acbbac3aa0
docker ps: introducing filters
...
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review
This requires https://github.com/dotcloud/docker/pull/4430
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 84146719d8b8322e302e7a0250fe8a3ee1a4edcd
Component: engine
2014-08-13 09:12:33 -04:00
ca40497b63
Update postgresql_service.md
...
fix typo
Upstream-commit: 99423e7e1ef7d833e333389b15a372179734c03f
Component: engine
2014-08-12 23:30:04 -05:00
21e5eefd8f
Removed merge conflict artifacts.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: e608312677d26f1f5b4f76852917d4f149ef88c1
Component: engine
2014-08-12 15:30:21 -07:00
d0c03fc901
Added fredlf's suggested changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: af5ced62ca604846b5e9ab852c7d47c9c176c702
Component: engine
2014-08-12 15:21:55 -07:00
547d1e2095
Merge pull request #7531 from ChristopherBiscardi/priv-repos
...
Private Repos Copy Change
Upstream-commit: d42326d9277dd12946981c7435d468807c462157
Component: engine
2014-08-12 09:50:21 -04:00
b9d0f7cfec
Docs: articles/certificates.md rewrite.
...
This commit contains a re-structured re-write of the original
certificated.md file, containing the amendments proposed with
PR #7120 (commit ID bd28595e310ccfa98) by @timthelion.
Related to: https://github.com/dotcloud/docker/pull/7120
2014-07-30: Update/rebase/squash based on the comments from @jamtur01 and @fredlf.
2014-08-12: Update/rebase/squash based on the comments from @fredlf (of 2014-08-12).
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7df54930716d3674f97d4a7e071a52f3769791ba
Component: engine
2014-08-12 14:49:08 +03:00
f5781e0e49
Updates docs regarding linux mint troubleshot
...
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br >
Upstream-commit: fcddecc828a95083db8975391e623289b2fe1254
Component: engine
2014-08-12 02:56:57 -03:00
b38de9ff8f
tell the user what to expect, including that it is a verbode process.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
2014-08-12 10:32:38 +10:00
9eaa199729
Remove Old shiftWindow()
...
closes #7493
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
Upstream-commit: 1e2ce72ffe28867021121745538c636e22f6f9e8
Component: engine
2014-08-11 17:12:34 -07:00
9379864263
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
Upstream-commit: df9650eebb12d980aaf114ac7b2223764dc964b7
Component: engine
2014-08-11 16:37:58 -07:00
