616b4d686e
Merge pull request #4995 from rajatpandit/patch-1
...
Update nodejs_web_app.rst
Upstream-commit: b811ac523a966af3e663f46b3b7b0afb2b7918b0
Component: engine
2014-04-04 14:40:55 +10:00
bc3cbf9f38
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
2014-04-03 17:16:25 -07:00
96808698c3
Deprecate 'docker insert'
...
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.
This removes the command from usage and documentation, and prints a
warning when it is called.
The command still works but it will be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
2014-04-03 23:52:09 +00:00
14694d6df5
Deprecate 'docker images --tree' and 'docker images --viz'
...
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 7c3b955b907c33238c1c155ae8860b2cec929c8b
Component: engine
2014-04-03 22:03:23 +00:00
66d94360a3
Update nodejs_web_app.rst
...
Upstream-commit: 3c36f82f181c4ce3b65dd15c4b6cb5699ea75075
Component: engine
2014-04-03 20:54:57 +01:00
06e40ba2fa
Merge pull request #4984 from michaelneale/master
...
explained what authConfig actually is
Upstream-commit: be882d989a4d1d23f05916a525cf7f8e5cf3da4b
Component: engine
2014-04-03 09:20:24 -04:00
6d320e0c92
explained what authConfig actually is.
...
Docker-DCO-1.1-Signed-off-by: Michael Neale <michael.neale@gmail.com > (github: michaelneale)
Upstream-commit: 75633a0451a98bf0c803e742625c4de27dbcc2e8
Component: engine
2014-04-03 19:43:21 +11:00
a941fe51a8
docs: Fix typo in hello world example
...
Upstream-commit: 8c4617e0ae3b9c7e5167883ca171ad8e23fc06b4
Component: engine
2014-04-03 09:40:28 +01:00
c536ebaf82
Merge pull request #4924 from msabramo/move_installmirrors_anchor_in_docs
...
Move installmirrors anchor in doc
Upstream-commit: 24e8b1b834f8e1dc4d963ec76d4f927cb41bbc2b
Component: engine
2014-04-03 12:48:01 +10:00
0ce7ba3626
Merge pull request #4972 from unclejack/document_a_flag
...
docs: explain what docker run -a does
Upstream-commit: e8cb65b3cc9a49baa95ca0e1fd6f13f7185bdce0
Component: engine
2014-04-03 10:23:39 +10:00
e3d229211f
docs: explain what docker run -a does
...
This adds a bit of documentation for the `-a` flag for docker run.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 63c7941172376e81c5e17206f39d7c78c0e95b69
Component: engine
2014-04-02 16:23:01 +03:00
7635abc6de
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 2b64453adbfdf715542b0b4274ed13e6f2a444da
Component: engine
2014-04-02 16:52:07 +10:00
63bbec4039
Merge pull request #4938 from jlhawn/master
...
No longer expose gravatar_email in docker.io api
Upstream-commit: 8cc8b1dd9989ede140c59ed40582c93552a5cd87
Component: engine
2014-04-02 09:13:33 +10:00
99eaa02040
Update docs. Make PULL up to date, remove deprecated falg and update PUSH
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: b8d660d946c5f0be3a4f01867b11f26a4f303293
Component: engine
2014-04-01 11:17:54 -07:00
72e62c1c7b
No longer expose gravatar_email in docker.io api
...
Docker.io API has replaced the gravatar_email field with a
gravatar_url field instead.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 289377b409b321a5a624af3517032c396df6c22f
Component: engine
2014-03-31 15:34:43 -07:00
3244462f0c
Move installmirrors anchor in doc
...
so it's before "Mirrors" instead of "Docker and local DNS server
warnings"
Docker-DCO-1.1-Signed-off-by: Marc Abramowitz <msabramo@gmail.com > (github: msabramo)
Upstream-commit: f16372022875a6dfe9d53489bde635789dd865a6
Component: engine
2014-03-31 11:48:57 -07:00
7fc896339a
--env-file: simple line-delimited
...
match dock functionality, and not try to achieve shell-sourcing compatibility
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: ff4ac7441ba582c8c339b25b400c6756d9646ff1
Component: engine
2014-03-31 14:45:13 -04:00
745a00084d
env-file: update functionality and docs
...
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 33dde1f7288781a3a36951309f963e6040a1a0f5
Component: engine
2014-03-31 14:45:13 -04:00
654ceecb5b
Fixing doc references to --env-file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: bcba5246f993a74eece36aa4b25df5b5e486e15b
Component: engine
2014-03-31 14:44:32 -04:00
d6e8571af8
--env-file instead of --envfile
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 586e6c5eb9cd21a95d4bbba051249c4b05b2011e
Component: engine
2014-03-31 14:44:32 -04:00
2d9f166bda
support for docker run environment variables file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cd51ac92bdf1ce0a1245f5b4565995631512ba64
Component: engine
2014-03-31 14:44:32 -04:00
a6c72fd1d9
Merge pull request #4900 from WarheadsSE/fix-bip-docs
...
Fix daemon's documentation for -bip flag
Upstream-commit: c8ae307bab1d0acb109fcbd4aea220a9ba3e03ca
Component: engine
2014-03-30 10:38:36 +10:00
e6fb80c434
Merge pull request #4887 from jameshfisher/nat
...
Add missing port NAT configuration
Upstream-commit: eaf2dd08394fdf4ddb934d59fb8163125aee50d8
Component: engine
2014-03-30 10:28:59 +10:00
0b1efc836d
Fix daemon's documentation for -bip flag
...
Upstream-commit: 36dfa0c4ec90404f76a6ec73c89d199e279ee96c
Component: engine
2014-03-28 18:02:17 -04:00
1647b890f4
Merge pull request #4862 from jsimonelis/dockerfile_reference_typofix
...
documentation typo fix -- Dockerfile reference
Upstream-commit: 058cc8818a44fab83f5274397de223f36e6910db
Component: engine
2014-03-28 16:18:45 -04:00
1bc1caf27c
Add missing port NAT configuration
...
Missing port translation causes last line to fail
Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com > (github: jameshfisher)
Upstream-commit: 64dd77fa0eb73ec4f395848982ccb60bb3bf8fc5
Component: engine
2014-03-27 23:02:44 +00:00
13e17899e1
Merge pull request #4613 from tianon/add-cgroupfs-mention-to-packagers
...
Add mention of mounting cgroupfs properly to PACKAGERS.md
Upstream-commit: be5c65c2a2df00df806c497cf9d5d70c635eb38f
Component: engine
2014-03-27 13:26:31 -06:00
544146df61
typo fix
...
Upstream-commit: 61f7d967ed635098abaf42fc411866bb198b97c5
Component: engine
2014-03-26 10:24:16 -04:00
365103a8e5
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
Upstream-commit: 5506e4b62dfad9d79fbeed91b9696fb51c736631
Component: engine
2014-03-25 14:37:27 -07:00
70fdc926f2
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 2517370088ad11765f99d75c16b58e93fe18f85a
Component: engine
2014-03-25 08:30:59 -04:00
674da9e17c
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
Upstream-commit: d9c11163035d3bd3d3b4a6eea46f5f57e5428b56
Component: engine
2014-03-25 21:03:04 +10:00
05ba4a16d9
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
Upstream-commit: 8e434c314ef74618001cc95466c2b567fa0283e2
Component: engine
2014-03-25 10:26:45 +00:00
f32e1ed77b
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
Upstream-commit: 30d25a3d27a80f0fcf0b9641e5d811f98e225d20
Component: engine
2014-03-25 20:15:39 +10:00
df52e0a2f8
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. dad4a998dconemannoducks@gmail.com > (github: noducks)
Upstream-commit: 69087f2d2397b18d6dd2d7b994e24ea9814e4bcd
Component: engine
2014-03-25 09:42:59 +00:00
e26ac10f84
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: c6c7c03cddc852c42b9f047fbd5c2fb6cecf39eb
Component: engine
2014-03-24 23:36:07 -04:00
2e34f473ea
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
Upstream-commit: 267ca39921c35826ccbdb84fbbc0690bfef385d7
Component: engine
2014-03-25 12:38:45 +10:00
1bb9a4e471
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
Upstream-commit: c84ff187c62060f20b7039a5005a44012898df7b
Component: engine
2014-03-24 22:29:54 -04:00
deed2b6616
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 84e1fdf35d9d6493d389a8e8be3ab41190004b30
Component: engine
2014-03-24 21:43:26 -04:00
68d9a195f9
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
Upstream-commit: bb034c6b42c347ffdfae834960bf2386429e1980
Component: engine
2014-03-24 21:39:15 -04:00
3c6aacdcbb
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
Upstream-commit: 0b2b5a594b6aadaffeab1d6ce823717390111f1e
Component: engine
2014-03-25 11:21:06 +10:00
186280f667
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
Upstream-commit: a258d048a221d2598f7317ee8e64765cb20fd588
Component: engine
2014-03-24 16:52:08 -07:00
aa948163e7
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
2014-03-24 12:03:56 +00:00
90b35c5f04
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 708ecd7da2125a47abb9678ed382893c7b30f10f
Component: engine
2014-03-21 14:17:09 -06:00
abc3562e62
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
Upstream-commit: 79c11b19ecd506bd76db391b896cec0d4263183d
Component: engine
2014-03-21 03:13:06 +01:00
0164d2be10
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
17b4dbb455
I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: a8cc6ebb181abf58b12ed6ee037711f0b2f1eff2
Component: engine
2014-03-20 09:59:54 +10:00
08db157788
Merge pull request #4784 from SvenDowideit/reference-security-doc
...
add a link to the security documentation when we mention the docker group (or -G)
Upstream-commit: f2b01f5fa1fbb54d2dd78e323b936834635a06c0
Component: engine
2014-03-19 17:20:44 -06:00
5afb3d1803
add a link to the security documentation when we mention the docker group (or -G)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f3765f96cfb37f6ea9f925f0d3174fe18c4152be
Component: engine
2014-03-20 09:08:52 +10:00
43102e0522
Merge branch 'master' into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: aa63ece2ec8bae9d13c258ad8e771e3a000cc941
Component: engine
2014-03-19 22:05:36 +00:00
d6e39e4b66
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
