Commit Graph

7153 Commits

Author SHA1 Message Date
a11d66ea07 Added back OAuth and Accounts API docs pages
Removed a now unused endpoint from the accounts API.
Updated some of the accounts links to point to www.docker.io
as the account signup and resend-email-confirmation links should
no longer point to the index.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: c6060a3b25b94ae4738ac27bbf62cbb914af7ced
Component: engine
2014-04-27 11:17:48 -07:00
62e9a76b63 Freeze ./integration and explain where to contribute new tests
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e83fc70d362bf0035811bbcc5566020c6cc9893f
Component: engine
2014-04-26 18:55:39 -07:00
ef52adb314 Merge pull request #5417 from jamtur01/readme3
Fixed double backtick to single backtick formatting issue in README
Upstream-commit: 40882cc0b676d00b52e43b9a42d67381f587f80d
Component: engine
2014-04-27 11:48:52 +10:00
f608a34704 Merge pull request #5416 from jamtur01/dockerize
Fixed Dockerise to Dockerize
Upstream-commit: 91cd60efd8ed646b9cbd114e9e92e7df4fb8b15c
Component: engine
2014-04-27 11:48:27 +10:00
fdb0b2b56e Replaced all double backticks in README with singles
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 723d314f097fe7b1e15f27c1d6f05794b6c5f411
Component: engine
2014-04-26 10:12:09 -04:00
97fe9aac5f Fixed Dockerise to Dockerize
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: df018bc8012ad4181ac16e1329c970fe213f1f87
Component: engine
2014-04-26 09:48:07 -04:00
7eb9afe4a1 Updated Docs README
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7744f63159cee9cfa5d9e9307e5c29a4f589837f
Component: engine
2014-04-26 08:10:19 -04:00
f2b5fc4e3c Merge pull request #5411 from crosbymichael/lockdown
Update default restrictions for exec drivers
Upstream-commit: 44140f7909ac65206d300fa9a39ae06cc27d1847
Component: engine
2014-04-26 03:27:56 +03:00
c0ccb32841 Merge pull request #5365 from crosbymichael/job-status
Add exported status code from a job
Upstream-commit: 4701f8ee60db9af11f35d24f8d4b163490722d60
Component: engine
2014-04-25 17:27:07 -07:00
ef140af848 Merge pull request #5342 from danielnorberg/avoid-suicide
avoid suicide
Upstream-commit: 077b7d0359ca9d1a9ee38a5342ad07929692c54a
Component: engine
2014-04-25 21:44:45 +03:00
10d3a0b394 Merge pull request #5401 from SvenDowideit/docs-api-eg-formating
small api doc formatting fixup
Upstream-commit: ed486081470b7f42c0113b406ee11d7310bd8bbe
Component: engine
2014-04-25 09:11:46 -04:00
72e7e8f048 small api doc formatting fixup
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: c7bd1f4e648c6615eafebbfcaeb1c30020fc0aba
Component: engine
2014-04-25 20:36:31 +10:00
490e1d25d6 Merge pull request #5355 from SvenDowideit/doc-ubuntu-14-04-lts
initial version of installation on ubuntu 14.04 LTS
Upstream-commit: a368c0dd50163fbdc2c9dc72abe2160c9111e64f
Component: engine
2014-04-24 20:06:08 -04:00
27e0450bda Merge pull request #5371 from ostezer/docs-add-docs-versioning-files-to-gitignore
Docs: Add docs new version files created by `make docs` to .gitignore
Upstream-commit: b3bea07d561d4efcdb5a47087eaf3ec1cd906fdc
Component: engine
2014-04-25 09:08:43 +10:00
75bef1c9a4 Merge pull request #5372 from SvenDowideit/docs-tweaks-to-socket-options
Docs tweaks to socket options
Upstream-commit: 1083b6d2ecc3dd5b71d285954aa6d101a5847db3
Component: engine
2014-04-25 09:08:22 +10:00
e46a516450 Merge pull request #5378 from ostezer/docs-fix-stray-url-from-warning
Fix stray url from beta-docs warning (remove aws bucket URI)
Upstream-commit: 7f64210e9eb463f217377621617c28ba1be87693
Component: engine
2014-04-25 09:07:58 +10:00
fc27b99e17 Merge pull request #5373 from vmarmol/master
Separating cgroup Memory and MemoryReservation.
Upstream-commit: 85540f6aa0c742c1623025b1fb235d7fd29cd9c7
Component: engine
2014-04-24 14:28:40 -07:00
d81d54cd3e Merge pull request #5335 from alexlarsson/remove-ghost
container: Remove Ghost state
Upstream-commit: 8af84c5e23cff006d7fe9c730613a618174f418c
Component: engine
2014-04-24 11:55:05 -07:00
69a18c6508 Separating cgroup Memory and MemoryReservation.
This will allow for these to be set independently. Keep the current Docker behavior where Memory and MemoryReservation are set to the value of Memory.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: f188b9f623e23ee624aca8654bf00f49ee3bae29
Component: engine
2014-04-24 11:09:38 -07:00
4269c4b6a6 Ignore isnot exists errors for proc paths
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d5c9f61ecc1c8167322a8cc3b41f29a35c80b9b8
Component: engine
2014-04-24 10:35:20 -07:00
72d2138bac Update init for new apparmor import path
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fa5cabf9fe9e257d64638043ca2fd08a7bf96cb3
Component: engine
2014-04-24 10:35:20 -07:00
8bd8490f43 Update create with apparmor import
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 90678b31331de54598c7a6665c3e7a78bfe6ed63
Component: engine
2014-04-24 10:35:20 -07:00
bccf8f7f86 Update container.json and readme
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d31aeb911fc94baa88f975110c5ccd45d041acb
Component: engine
2014-04-24 10:35:20 -07:00
b3bc92caaf Increment native driver version with these changes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d6c3674349c09318e8d1fb3ce43dbabc15c97da
Component: engine
2014-04-24 10:35:20 -07:00
8ab9384720 Move capabilities into security pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a0b3610664c2269fd5932f294adae72e6e54020
Component: engine
2014-04-24 10:35:20 -07:00
28044eef7b Move mounts into types.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 156987c118f6f4067794e09e90aabeee0002d05c
Component: engine
2014-04-24 10:35:20 -07:00
c05360ff3b Move rest of console functions to pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a949d39f195e7b87288b10b0ef31843e6a3d8eb0
Component: engine
2014-04-24 10:35:20 -07:00
0099e7d236 Refactor mounts into pkg to make changes easier
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 05b611574f85c7ff7d479e04e01ac2b57b233591
Component: engine
2014-04-24 10:35:20 -07:00
0cfbbc14e7 Move console into its own package
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: de3d51b0a824e31d7e245aed958d53f436456699
Component: engine
2014-04-24 10:35:20 -07:00
a750afc31e Mount over dev and only copy allowed nodes in
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5ba1242bdc309352c2b0b9a1ef9e07fe835e4857
Component: engine
2014-04-24 10:35:20 -07:00
20ba5d97da No not mount sysfs by default for non privilged containers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 81e5026a6afb282589704fd5f6bcac9ed50108ea
Component: engine
2014-04-24 10:35:20 -07:00
bdab73285c Add lxc support for restricting proc
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0779a8c3287fbf7ff1938df10897b551b839cbee
Component: engine
2014-04-24 10:35:20 -07:00
9da373d6b1 Add restrictions to proc in libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 60a90970bc4add3547064004f08c19ab5027141b
Component: engine
2014-04-24 10:35:19 -07:00
4b4b1b7313 Move apparmor into security sub dir
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d26ea78e42ebf18219b88e01c6252f30aa764aa2
Component: engine
2014-04-24 10:35:19 -07:00
f6b631e3c8 Merge pull request #5381 from rjnagal/master
Add support for cpu hardcapping to cgroups.
Upstream-commit: 4ed165210fd81ab7ee41cb7b67667b17949b084e
Component: engine
2014-04-24 10:04:17 -07:00
8b8d39c95a Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create
devicemapper: Don't mount in Create()
Upstream-commit: 56b779c32154327c2939a2e653fda3623b6f63b4
Component: engine
2014-04-24 08:19:59 -07:00
4a39371d62 Add support for cpu hardcapping to cgroups.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 264dc8a46bb7f7679439d0a2c41c79a09642acab
Component: engine
2014-04-24 14:43:02 +00:00
9d22789050 Fix stray url from beta-docs warning (remove aws bucket URI)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 5e5230cb190b6d78cf27706da447d179b79b29b6
Component: engine
2014-04-24 16:29:12 +03:00
adad81a2c2 initial version of installation on ubuntu 14.04 LTS
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: da8f6ffdeb54a2d99a70deb4ffc58fdff76d5880
Component: engine
2014-04-24 22:59:59 +10:00
b6080f6f5b Looking into some broken links, I noticed that we don't need to use
relative paths, and also fixed some broken images.

There are still more todo - next PR I think :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ada86fc5b736d8b3209429c584384fd9974a148a
Component: engine
2014-04-24 22:20:04 +10:00
772ac62a9b Docs auto-conversion fixes and MD marking and structure improvements.
- Remove redundant chars and all errors caused by RST->MD conversion.
   e.g. [/#, /\, \<, />, etc.]
 - Fix broken inter-document links
 - Fix outbound links no-longer active or changed
 - Fix lists
 - Fix code blocks
 - Correct apostrophes
 - Replace redundant inline note marks for code with code marks
 - Fix broken image links
 - Remove non-functional title links
 - Correct broken cross-docs links
 - Improve readability

Note: This PR does not try to fix/amend:

 - Grammatical errors
 - Lexical errors
 - Linguistic-logic errors etc.

It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Fix backtick issues

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c932667cd26f00bb64ddf0c1a7c7de3ac95aa4be
Component: engine
2014-04-24 22:19:32 +10:00
7008cb66b2 Docs: Add docs new version files created by make docs to .gitignore
Files are:

 - docs/AWS_S3_BUCKET
 - docs/GIT_BRANCH
 - docs/VERSION

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Remove unnecessary last blankline
Upstream-commit: d9f9021e9b8bc46481b4c2bb28786fd3f0b88b9c
Component: engine
2014-04-24 13:33:00 +03:00
e8a3419885 Merge pull request #5362 from sindhus/patch-2
Update link to interactive tutorial
Upstream-commit: 83b388c979b3d24c6e9f1604eaa46f5f1ce10ecb
Component: engine
2014-04-24 00:22:04 -04:00
84cddc3f87 add a reference to multiple -H options, and update the other example of -H option
and copy changes to the cli.md file

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b2c87fe08b71523eb20fed63e5da3bef30b756ec
Component: engine
2014-04-24 11:24:58 +10:00
5742188cb8 - unix://path/to/socket should read unix:///path/to/socket like the rest of the documentation (a slash was missing)
- Mention that [] options may be specified multiple times on the Usage page

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: mikemaccana)

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: SvenDowideit)
Upstream-commit: e62efb266fd878453b8562e60b06a3e579fe571a
Component: engine
2014-04-24 11:11:51 +10:00
32bae00bdb Merge pull request #5349 from ipbabble/manpages
Manpages - fixes and merged tianon/docker man1-assumption branch
Upstream-commit: 0ade0af27ee5de5ac7e1e469dcc23ad408dd3b39
Component: engine
2014-04-24 09:43:42 +10:00
f06dbcb7ce Merge pull request #5345 from shykes/engine-installer
engine.Installer: a standard interface for "installable" services
Upstream-commit: 0fe48b0e5914fa1384d061546970e23fb348b53f
Component: engine
2014-04-23 16:16:55 -07:00
415365ba93 Merge pull request #5347 from crosbymichael/engine-root
Remove root dir from engine
Upstream-commit: baf6cf90561a1582683c92dd209e36f78a39288e
Component: engine
2014-04-23 13:53:08 -07:00
4ac9260833 Add exported status code from a job
This allows the job's status code to be consumed externally so that we
can use it as an exit code or saving to a state file.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f90029611fec082a41b5629e43a88a39f0674fe2
Component: engine
2014-04-23 13:47:56 -07:00
8c2dd7e7a4 Update link to interactive tutorial
Upstream-commit: 81477a204f910fb5ce518a62c64047a0aa9ce017
Component: engine
2014-04-24 01:59:52 +05:30