Commit Graph

1171 Commits

Author SHA1 Message Date
9e9837fce8 please, for the love of Docker, do. not. use. symlinks
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f787bec4a6853b46b1ba755d4f8a2ee07d9cbd3e
Component: engine
2014-02-07 20:20:41 +10:00
f006ee4708 Added Security FAQ security
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 55b74bfe469115f25a52c6ad48b13eb9c7e6197c
Component: engine
2014-02-07 01:42:11 +01:00
503a038711 Added installation docs for CRUX as a Docker Host.
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
Upstream-commit: f5d028c83868082049994ad544c99291a117797d
Component: engine
2014-02-06 10:37:33 +10:00
720e1e3427 Merge pull request #3944 from joeshaw/patch-1
Always download things over https
Upstream-commit: 9dd92a9823d7021c20a8c3f596fe2c68129bf6a6
Component: engine
2014-02-05 13:56:41 -08:00
246155a392 Merge pull request #3938 from SvenDowideit/workdir-doc-tweak
be a little more explicit about what WORKDIR does
Upstream-commit: f9f30f1ced0c9dfe5756433ef8240f3f8c8e6d71
Component: engine
2014-02-05 13:54:49 -08:00
381b0e5021 Always download things over https
Docker-DCO-1.1-Signed-off-by: Joe Shaw <joe@joeshaw.org> (github: joeshaw)
Upstream-commit: 3841e8862596637b904acf7f64b657bf3c9b49b1
Component: engine
2014-02-05 15:46:41 -05:00
4946b514fb be a little more explicit about what WORKDIR does
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a17d7d9a73a23dc1fb2269b34418f2c7a645598b
Component: engine
2014-02-05 13:26:49 +10:00
0d35109949 docs/installation/google: remove -mtu flag
Upstream-commit: 650200239b1bd5182524b9a0edf7f9981ab053b2
Component: engine
2014-02-04 17:19:05 -08:00
2ec14b9b9e Merge pull request #3928 from metalivedev/fixheadings
Fixes headings in Table of Contents, link from FAQ.
Upstream-commit: 501d0499f89f3d775d39552141e002ad139222d2
Component: engine
2014-02-04 14:59:24 -08:00
e7dbf5bfd0 mac-installation-docs: Update the installation dir.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: aed37e70b9ca2cff1749fb2de639a11b9c346d67
Component: engine
2014-02-05 00:44:55 +02:00
ce01d33e55 Fixes headings in Table of Contents, link from FAQ.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 18b896e0f032b6ec71fc7c5e56b2acd470c0fe50
Component: engine
2014-02-04 14:16:27 -08:00
8302cc3ec1 docs: Installation on Mac OS X 10.6 Snow Leopard
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: a9b325e5b00095a44617aa4b146e51f048e213ba
Component: engine
2014-02-04 22:26:06 +02:00
eaeb410e5e New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9f994c96468e2495a2dc118355b6565e7dac0f44
Component: engine
2014-02-04 01:31:19 +00:00
ceeacc939a Merge pull request #3887 from proppy/detect-network-mtu
docker: detect defaultNetworkMtu from default route
Upstream-commit: b56440fa2491505aa239b060faacfc12ac23d3c7
Component: engine
2014-02-03 16:35:15 -08:00
a5869c9f8d Merge pull request #3883 from metalivedev/fix-3879
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
Upstream-commit: 8beca66741c74fa385fe7b8f91e7a73f4342cf90
Component: engine
2014-02-03 16:09:54 -08:00
2e2c23075e Updated width to 815 per comment.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: fca2f3e742d699688c9891ccf9dd8e58591aed08
Component: engine
2014-02-03 16:06:29 -08:00
dbbc9e5b0b docs/cli: add mtu option
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
Upstream-commit: ab1482e9c25b3c27b48d97ac84e60efb39ae8af7
Component: engine
2014-02-03 16:01:38 -08:00
4621ae86b1 Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
Everyone probably wants to run `docker pull ubuntu` before building with this change.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
2014-02-03 11:08:35 -07:00
7b2e0fd00d Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: b0f4ad431d79869111cfbf506a783a275c274c68
Component: engine
2014-01-31 18:02:45 -08:00
4ae61a560f Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
Upstream-commit: 70ab72ff32fdfd91e8ba8c2c294c649ec5e2d84a
Component: engine
2014-01-31 10:27:04 -08:00
90c3a9efe5 Merge pull request #3861 from metalivedev/fixkerneldeps
Fixed link to kernel dependencies. 
Upstream-commit: feea1dda41ea33533f358329348333236f587874
Component: engine
2014-01-31 10:25:25 -08:00
62ffc05f30 add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kill see #3844
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 630459f2b84c9664b436eb076cfac39d731f08bf
Component: engine
2014-01-31 12:30:16 +10:00
cc8be8350a Merge pull request #3758 from metalivedev/2720-running
Fixes 2720
Upstream-commit: e64a9a3bada4864a9358cffdf09aed0290c52a33
Component: engine
2014-01-30 16:09:19 -08:00
cdd32376a9 Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 98518bbcad85217ac36112f6a18a275816b38287
Component: engine
2014-01-30 16:03:13 -08:00
29c6c509be Add troubleshooting for missing cgroups on mint 16 #3602
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 626a2e1112b6e802415f80ff7a3682296636f55a
Component: engine
2014-01-30 20:53:27 +10:00
d5c4282d8f Merge pull request #3835 from thinkingbox/master
Fix typo
Upstream-commit: 41c10fb25632ba5bc65a78e84c2f851e93f80ee4
Component: engine
2014-01-29 23:55:36 -08:00
be70505326 Fix typo
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com> (github: thinkingbox)
Upstream-commit: 7d95ce6ddda89a392b94c6dcfcb7774b2a19cf1a
Component: engine
2014-01-29 23:07:23 -05:00
0a0316537a Merge pull request #3734 from stpierre/mkimage-yum
Added new mkimage-yum.sh script to create CentOS base images
Upstream-commit: 95dff84728493ff8d5ac2805473686afb70323f3
Component: engine
2014-01-29 14:52:51 -08:00
ea8660fa0f Merge pull request #3813 from jpoimboe/update-ip_forward-docs
docs: remove ip_forward enabling step
Upstream-commit: c82a2d1adfb2b2a838a12e0c3baea1d42fe7f3ad
Component: engine
2014-01-28 18:08:22 -08:00
ec0c7b9842 Address feedback from @jamtur01.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: f3a032f27b80e8194cb7f14df848f063a56c5f26
Component: engine
2014-01-28 17:32:05 -08:00
cf3378c12f docs: remove ip_forward enabling step
Now that docker sets /proc/sys/net/ipv4/ip_forward by default, remove
the step to enable it in the installation docs.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: aeb2f479fa1c063867475a610ddbfe4f8883dfda
Component: engine
2014-01-28 13:29:27 -06:00
599a6cd34c fix(cli.rst): add missing underscores
As suggested by @metalivedev

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 2fe7588af79bbc61e758ff066be1cf1c2d381f7b
Component: engine
2014-01-27 17:18:09 -08:00
7f4461fb98 Allow fd:// like unix:// and tcp://
Somthing like 20605eb310f0b57bd06eea80ec63c5022fc83bde

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 7f9d3268bf0e1d4a79d07c67e22eb14d3de96f6c
Component: engine
2014-01-27 17:18:09 -08:00
5197c3fef9 fix(docs): add Systemd in front of socket activation
Suggested by SvenDowideit.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 6acc99889d97638d632a2974e04cd91ed4036c4b
Component: engine
2014-01-27 17:18:09 -08:00
efeecbbbfb docs: improve the socket activation cli docs
as suggested by SvenDowideit expand the docs to have more information on
socket activation.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4a90f00ab7ec9e534c97611dbbdc412ed5966602
Component: engine
2014-01-27 17:18:09 -08:00
bbf27c35bb fix(docs): fixup based on changes in master
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: cfeb1f0f652e11b8b6a8b4e1cbed3835fc5d9546
Component: engine
2014-01-27 17:18:09 -08:00
5ca9f4270c Fix 2720 -- Expanded documentation for docker run.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 07c4eda46a6a1af82b4b519d9186b9bf7881d7cc
Component: engine
2014-01-27 14:44:24 -08:00
254ce5fef5 Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
2014-01-27 12:09:03 -08:00
d680ae54b5 Merge pull request #3781 from mattymo/patch-1
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
2014-01-27 12:06:43 -08:00
8e2497b678 Merge pull request #3773 from mnaberez/supervisord-apache2-example
Use exec to replace bash with apache2 after environment is set up
Upstream-commit: adae0b248d6f6732f15ef96f856ac097d038a181
Component: engine
2014-01-27 12:01:59 -08:00
b231028354 Update puppet.rst
Upstream-commit: 551e1a766c8aaec190972e3542fd8a1c7452b6b2
Component: engine
2014-01-27 18:21:48 +03:00
11aa2d4639 Clean up grammar on puppet.rst
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
2014-01-27 15:13:17 +03:00
47410e7905 Use exec to replace bash with apache2 after environment is set up
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com> (github: mnaberez)
Upstream-commit: 2ba2a8ae40b83ac1cc0c4a60724073fa8255b257
Component: engine
2014-01-26 11:53:22 -08:00
5d3cc5f71c move image name into correct position
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
Upstream-commit: 31e59580092bd4f144bf512e2fd13dcba426b02a
Component: engine
2014-01-26 08:11:30 -05:00
0badcc35ea Fix TOC for Articles
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
2014-01-23 18:55:26 -08:00
3123b44774 Added new mkimage-yum.sh script to create CentOS base images
mkimage-rinse.sh requires rinse, which is not readily available on
CentOS or Fedora.  Plus, creating a base image is trivial with yum
alone.

Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
Upstream-commit: d419da7227826e84e9375ece4fd9d4978a42cbf7
Component: engine
2014-01-23 07:09:44 -05:00
9f4a307e6f talk about the new exec form of RUN (Closes #3723) implemented by #3558
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: bfc1043f36dcce7f6232be55148f52327e356933
Component: engine
2014-01-23 14:00:16 +10:00
a01f048b9e Merge pull request #3716 from johngmyers/patch-1
Grammar fixes and wording improvements
Upstream-commit: 700db10c850f4721ab890c1d4f0fa22a2fbaa29d
Component: engine
2014-01-22 12:01:13 -08:00
b2fe863a63 Merge pull request #3713 from SvenDowideit/document-bind-mount-file
bind mounts work for files - give an example, as its very very useful.
Upstream-commit: 9a2e673f4f5999c5b3a282c7f6ffe87793dfd5e5
Component: engine
2014-01-22 11:54:41 -08:00
6e009b9cf4 move the contributing hook into hack, and use curl in the same way as the gofmt above
and remove the fmt-check one we don't document

tianon tells me they're called GitHub, not Github :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7c55cbd4c9da88ffb4b1a325ba2e5435e337a3af
Component: engine
2014-01-22 21:31:42 +10:00