d5259f3ff9
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
Upstream-commit: 92f4bd59ce941233b295ec2b2e5faa974105ad40
Component: engine
2015-04-25 20:33:55 -07:00
940ced577b
Fix documentation typo in articles/basics.md
...
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com >
Upstream-commit: 2188c8d2f41f4905411a40c30f4c703d7f4e0fcf
Component: engine
2015-04-25 11:32:17 +03:00
cc66f7a04e
Merge pull request #12502 from calavera/shallow_git_history
...
Shallow clone using git to build images.
Upstream-commit: 790c63a5ef34d54ae8ba79886b6c8daae547bf25
Component: engine
2015-04-24 10:16:01 -07:00
ecfd095619
Document the extra depth argument in git contexts.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 8bd5a95e1e39541dfc5dc635c5c8e7604fe10028
Component: engine
2015-04-24 09:39:39 -07:00
4b91c36f40
Merge pull request #12678 from vdemeester/fix-advanced-contributing-doc
...
Documentation: fix the design proposal link in advanced contribution page
Upstream-commit: 310fc37fe76421109109c11c1181b97ce93b6c80
Component: engine
2015-04-24 11:12:36 -04:00
9d65fe4b0e
Copy over the DHE documentation for release to docs.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: b0ad95daa84354c4b41679d0182fafbd259e5a69
Component: engine
2015-04-24 12:39:58 +10:00
be8a515938
make space for DHE menu item again
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 493437616d1aabef50768d71ce786595f7295554
Component: engine
2015-04-24 12:39:49 +10:00
734115a06e
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
2015-04-24 08:54:08 +08:00
85c05759af
Merge pull request #12712 from moxiegirl/carry-docs-update-9397
...
Removing firewalld info
Upstream-commit: 09052a55727d5686c06716b24bdfe13c469a7d26
Component: engine
2015-04-23 17:24:27 -07:00
41b25e1b54
Merge pull request #12711 from Shopify/fix_doc
...
[docs] small markup fix
Upstream-commit: b830b823cd4c8b45d68cef8cd1bbeb5d705d5262
Component: engine
2015-04-23 15:07:46 -07:00
33d9437505
[docs] fix formatting issue
...
Signed-off-by: Florian Weingarten <flo@hackvalue.de >
Upstream-commit: 55d1ac645cc36bb40046b2bcc400f8740ed2e86c
Component: engine
2015-04-23 21:17:12 +00:00
250a79f32d
Removing firewalld info
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b6d8b65e5595304ef9b89f1f2ff2cae46c70dae9
Component: engine
2015-04-23 14:04:36 -07:00
63429192b7
Fix typo in builder reference
...
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
Upstream-commit: 47263c6514457d58c1062671077118063189d433
Component: engine
2015-04-23 12:10:47 +02:00
bfabfc7585
Fix the design proposal link in advanced contribution page
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1f7ba6f80914cc663b3b38ffc0b2c8e1add2547a
Component: engine
2015-04-23 09:48:11 +02:00
701a9fb9a1
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
2015-04-23 07:41:30 +02:00
0f579f7454
Merge pull request #12652 from jfrazelle/update-contrib-docs-for-go-check
...
update contrib docs for gocheck
Upstream-commit: cc43263f8c2d4f2df7f99d0e375797295f672b47
Component: engine
2015-04-22 17:47:22 -07:00
03223ccad9
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
Upstream-commit: 3dc07162bdb457c86c0d5025d1d633131fadcfd1
Component: engine
2015-04-22 17:20:10 -07:00
8db174e734
Merge pull request #12615 from moxiegirl/update-repository-links
...
Fixing a few links in registry
Upstream-commit: b6702116be4c554e7856017bfde62e1a23c0e349
Component: engine
2015-04-23 10:02:02 +10:00
1fb3f6d19e
Merge pull request #12614 from ankushagarwal/ubuntu-docs
...
Add Configuring Docker article
Upstream-commit: 84a9962a6350e8e7c5a12e6825f53c202afec416
Component: engine
2015-04-23 09:41:11 +10:00
c2d93a9162
Merge pull request #12586 from ankushagarwal/image-digests
...
Add Image Digest doc in userguide/dockerimages
Upstream-commit: ce7e1a4d7e600f0fcff96ccc2d8bf4236916fa60
Component: engine
2015-04-23 09:23:23 +10:00
1563e7c4d1
Merge pull request #12513 from allingeek/patch-1
...
builder.md - Changes to bring LABEL docs in line with 1.6 release.
Upstream-commit: b2aca01d95caea18480642f48aacbe43e283fd0c
Component: engine
2015-04-23 08:58:59 +10:00
bfa8bbb7bb
Merge branch 'master' of github.com:docker/docker into journald
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: b88b2fa72ea4ad579478080ce6f027e55cfd5c29
Component: engine
2015-04-22 17:37:26 -04:00
58808570b1
update contrib docs for gocheck
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a09ab40f0d980b2a6d6656db638f1fc5d73f5b8b
Component: engine
2015-04-22 13:19:14 -07:00
e6ff00789e
Update with @moxiegirl's patch and add direct config
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9689aab5ec0141a70c2134d18cb581ec5a923c5f
Component: engine
2015-04-22 10:36:38 -07:00
18e1b423ee
Fixing a few links in registry
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
6284903b5f
Add Configuring Docker article [WIP]
...
Fixes #12088
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
a499d975cf
Putting into our new format for cloud
...
Adding in Seb's comments
Updating with Fred's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: bc7a43cb44fc0541939f10186e326e3139403605
Component: engine
2015-04-21 14:48:48 -07:00
60a0268238
Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
...
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
2015-04-21 14:08:31 -07:00
b0e45c14c4
Add Image Digest doc in userguide/dockerimages
...
Fixes #12551
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: a4676503d9531b50b26643df5ea3975bdec6b4df
Component: engine
2015-04-21 12:47:09 -07:00
b04ccc089c
Add journald as a supported logger for containers
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
2015-04-21 12:57:54 -04:00
420c9f4038
Merge pull request #12563 from kentoj/patch-1
...
Clarify data volume init with existing data
Upstream-commit: afd56364618c8c638769a8e9fceeaa5376e46ff5
Component: engine
2015-04-21 08:57:22 -07:00
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
23af23a14a
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
2015-04-20 17:28:24 -07:00
9d30ecdb29
Merge pull request #9381 from lebauce/default-gateway
...
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
2015-04-20 15:50:35 -07:00
3d767d2ff0
Adding in 1.60 release notes
...
Updating with thaJetzah's comments
Adding in Fred's copy edits
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1f4ef5192c05723e231acc47813c4c8455a0166b
Component: engine
2015-04-20 13:31:22 -07:00
f6f7e91ca2
Clarify data volume init with existing data
...
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.
Signed-off-by: Kent Johnson <kentoj@gmail.com >
Upstream-commit: ff9f0134aefbee1d3d757454f42e8dd99afb528e
Component: engine
2015-04-20 14:24:40 -06:00
9bc2d6ce93
Merge pull request #12414 from draghuram/projectdoc
...
Improve documentation in "project" directory.
Upstream-commit: f85eb4baadd810b27ff9bff0d23361afc6d08153
Component: engine
2015-04-20 13:16:20 -07:00
44c88b9112
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
2015-04-20 13:05:24 -07:00
cf21a7328b
Improve documentation in "project" directory.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: fcdb1fbfa1e691bbdfb73a289ff84fbf6b26fad6
Component: engine
2015-04-20 13:08:13 -04:00
f8f4bcdb38
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
2015-04-20 08:16:47 -07:00
6f062d5e99
Allow specifying a default gateway for bridge networking
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
2015-04-20 15:13:30 +02:00
96f82039c1
Remove some unsupported instructions in the docs.
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 49be84842e41a612601ff9d0563ec30f138e95bc
Component: engine
2015-04-20 16:48:17 +08:00
cd0d00e4c3
Merge pull request #12518 from moxiegirl/fix-12516-registry-doc
...
Docker Registry Server > Docker Registry
Upstream-commit: 2e58350bd6f8c80f4d545bc00d83127d76ab991d
Component: engine
2015-04-19 07:14:09 -07:00
253cd30553
Merge pull request #12512 from ankushagarwal/document-binaries
...
Document the download location of Linux, Windows and Mac OS X binaries
Upstream-commit: 547ded5df7622d1caf2e096d5b32a21c44b17ae6
Component: engine
2015-04-19 07:12:45 -07:00
714aa2e550
Document the download location of binaries
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 99251f60c2f554fc03ddc9e7b478de6bd5cf0b49
Component: engine
2015-04-19 01:51:03 -07:00
d18c57d820
Docker Registry Server > Docker Registry
...
Fixing registry index
Tested on beta and this redirect works
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
2015-04-18 19:19:48 -07:00
b2ac76cbc3
Update builder.md
...
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com >
Upstream-commit: 89df65be5d3ee72cd6e1b4aa53953a62f4b5d00a
Component: engine
2015-04-18 11:38:20 -07:00
b527679d3d
docs: speed up build by reducing build steps
...
- should be also easier to maintain
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: bbe6df128802b22605f9eb079f105460ec78ac6f
Component: engine
2015-04-18 13:28:52 +02:00
f4a4f24956
Updates to Compose docs and ENV vars
...
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
2015-04-17 13:08:57 -07:00
969c19149d
Merge pull request #12484 from superseb/12367-jessie-instructions
...
Added Debian 8 note for adding backports
Upstream-commit: 4492977437fe76e9984a5be2aba2c294c26b622b
Component: engine
2015-04-17 10:16:53 -07:00
