9af361f6e2
Merge pull request #12245 from buddhamagnet/dockerignore-ignores
...
Add support for exclusion rules in dockerignore
Upstream-commit: 4676ff3fd72f92fc26c3a1d9d588ed544fb46b55
Component: engine
2015-04-28 11:28:46 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
d9d6af7cf9
Merge pull request #12644 from psftw/official-repos-rewrite
...
Rewrite Official Repos page.
Upstream-commit: dde5ff2872bb76ccbc279f4cd52d7c75565a3b75
Component: engine
2015-04-28 08:57:29 -07:00
65ecb50b1e
Merge pull request #12814 from vbatts/vbatts-rhel_updates
...
RHEL updates
Upstream-commit: 6113eab1740a0cfe8d6f504cc270027c211ae864
Component: engine
2015-04-28 08:51:35 -07:00
24c022aa2a
rhel.md: adding link to most recent issue
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 9b365e0845bf8e74cef23db2233e721b90ae4339
Component: engine
2015-04-28 11:28:33 -04:00
237e42e47c
rhel.md: bump the kernel version for RHEL6
...
Closes #9856
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 179b6ddc353fd766125df19bf61b00a39a13cd04
Component: engine
2015-04-28 11:28:33 -04:00
112a3bf0ea
rhel.md: update RHEL6 from 6.5 to 6.6
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: ed40c0a9a48e54dbe341ad718d9362a268467378
Component: engine
2015-04-28 11:28:23 -04:00
00b8817331
Rewrite Official Repositories page.
...
The existing page is focused on listing a set of requirements for
proposing a new repository. This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories. This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing. I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: 8f52eb7b827d658d6974056460afd722a5cb040f
Component: engine
2015-04-28 00:37:17 -04:00
1a5a13dff9
add initial docs for windows client testing
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
docs: crop and optimize images
Cropped and optimized images.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Testing and updating the Windows material
Signed-off-by: Mary Anthony <mary@docker.com >
checkpoint
Signed-off-by: Mary Anthony <mary@docker.com >
Fitting the Windows specific material into the contributor guide
Signed-off-by: Mary Anthony <mary@docker.com >
Entering James comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: af8efab7561484debffa3f6782eaea199fa22506
Component: engine
2015-04-27 21:21:53 -07:00
e914ea7488
Merge pull request #12817 from WeiZhang555/man
...
improve docker man page
Upstream-commit: 779939e334ea33081d3ad7a4364be1b1b4801c3d
Component: engine
2015-04-27 22:59:11 -04:00
e6a94f3935
Merge pull request #12798 from dnephin/add_missing_docs_about_labels
...
Add missing API docs about filtering by label
Upstream-commit: aebeefa886ce18d4b0b75c83b9692d24f8eb2b5e
Component: engine
2015-04-27 17:37:10 -07:00
602d598095
Do Debian installation verification with hello-world image.
...
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.
Signed-off-by: Matt McCormick <matt.mccormick@kitware.com >
Upstream-commit: b6cfe7ca07722cee22345602595fc8fb928dbe79
Component: engine
2015-04-27 13:53:30 -04:00
25e6857dc9
improve docker man page
...
fix issue #12708 :
"docker man page is misleading about format of commands"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 29f379ea6e2a68d8ac4bf41d3559a52066a275a0
Component: engine
2015-04-27 23:27:35 +08:00
b5c5cd32f2
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: cfd0f53b03d26c370e37abf651d7f481ee8c6912
Component: engine
2015-04-26 15:36:01 -04:00
145f0ac265
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
Upstream-commit: 6cba3109c2a9c0c20d2541605a9aa7873225a224
Component: engine
2015-04-26 10:40:18 -07:00
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
d7a0961327
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
2015-04-25 15:01:05 -04: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
