Brian Goff
65832d3e7c
Adds info on how to get env vars from container
...
Currently the docs just say "let's go into the container and look at the
env vars", but doesn't show how to do it. It is also not currently
possible to enter the container as it is written in the doc
( container started with app.py and then somehow later on we have a
shell in the same container )
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbf7815b2591adce4d9584feb75592c6facb92e1
Component: engine
2014-06-12 09:26:55 -07:00
O.S. Tezer
f2a648f243
Merge pull request #6372 from ostezer/docs-fix-logged-in-hdr
...
Docs: Fixed logged-in header username label target
Upstream-commit: dbee7dd69eeee8d740de4ded34c3cf4c422329ca
Component: engine
2014-06-12 01:17:38 -07:00
Tianon Gravi
842778e1c8
Merge pull request #6361 from asbjornenge/tmlang_copy
...
Add contribute/syntax highlight for the COPY instruction
Upstream-commit: 3b9e8679db5c312ab28048a10050ef085445bb67
Component: engine
2014-06-12 00:06:51 -07:00
Asbjørn Enge
3174a5ef95
Added highlight for the COPY instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: cb47ddd968747091fd1b3d408dd36c4c2086e69f
Component: engine
2014-06-12 08:25:09 +02:00
O.S. Tezer
67655304d5
Docs: Fixed logged-in header username label target
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 4ccd91f0d8052ada203e2551b11121613d54f44a
Component: engine
2014-06-11 18:09:43 -07:00
Michael Crosby
455e8c968c
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
Upstream-commit: c99ee556d4e9a028fa68b40816b75200be690534
Component: engine
2014-06-11 14:37:01 -07:00
Michael Crosby
95ca86414e
Merge pull request #6335 from levigross/master
...
Fixed up if statement
Upstream-commit: 9ac293e1a8e1463f3fac1713213c9d250642ace8
Component: engine
2014-06-11 11:51:57 -07:00
Michael Crosby
1ddec5f792
Merge pull request #6357 from crosbymichael/vendor-libcontainer
...
Vendor libcontainer
Upstream-commit: 6c953a305976c8270d8d5f2b14a169bc21703abb
Component: engine
2014-06-11 10:57:39 -07:00
unclejack
5cc0b3dff6
Merge pull request #6277 from philips/remove-unneeded-time-duration
...
registry: remove unneeded time.Duration()
Upstream-commit: 8f909221f51a4b1d23f5829b68debd0782293cc7
Component: engine
2014-06-11 20:33:22 +03:00
James Turnbull
89cd4745de
Merge pull request #6351 from lenw/patch-1
...
minor spelling fix
Upstream-commit: 96c03d6d920c87305bdb8abfd188de71aaaf8bb5
Component: engine
2014-06-11 06:55:33 -07:00
James Turnbull
3b1b01d0f2
Merge pull request #6349 from chrismckinnel/master
...
Fix some bullet points so they render correctly.
Upstream-commit: a092f979d44163692e98d67f65063b9ee35abbeb
Component: engine
2014-06-11 06:54:44 -07:00
Len Weincier
f73a57c5b6
minor spelling fix
...
Upstream-commit: db00e224c2ae76096490c29357ef041ded7fadfc
Component: engine
2014-06-11 13:16:53 +02:00
chrismckinnel
30903b9316
Fix some bullet points so they render correctly.
...
Upstream-commit: a247af9c97be92f91242db51f4a9545db1bda702
Component: engine
2014-06-11 11:44:30 +01:00
Michael Crosby
6c66f51853
Use libcontainer version tag for vendor script
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d1757c005f05c76b31615d1d4d27722faee8012e
Component: engine
2014-06-10 20:23:05 -07:00
Michael Crosby
52b8a282c3
Update libcontainer imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8194556337b65dda71a3d4d7f6ae9653ad5a19a0
Component: engine
2014-06-10 19:58:15 -07:00
Michael Crosby
b8d91613b1
Remove and vendor libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8a8b6d79649f666dd00f2efd60f773bb3eed898d
Component: engine
2014-06-10 19:49:57 -07:00
James Turnbull
b71d34e96b
Merge pull request #6339 from ostezer/docs-fix-css-title-conflict
...
docs: Fix docs' styling conflict with common names
Upstream-commit: 4cf40c968f072d51272217b30ef2b8f5cba55ffe
Component: engine
2014-06-10 13:40:22 -07:00
O.S. Tezer
0e782ce982
docs: Fix docs' styling conflict with common names
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Closes issue #6329
Upstream-commit: cb40e3302e41c62d17a4d7c1935dd28e64ee2748
Component: engine
2014-06-10 11:18:20 -07:00
James Turnbull
84ab25456a
Merge pull request #6322 from crucerucalin/master
...
Repaired broken links in docs/sources/faq.md
Upstream-commit: 9a7bd6d95b42d89db4c005e6fcbc0535f4031bfb
Component: engine
2014-06-10 08:46:42 -07:00
Sven Dowideit
5e91e03e8e
Merge pull request #6315 from erikh/ubuntu-latest-install-docs
...
Improve documentation on Ubuntu for getting the latest release of docker.
Upstream-commit: 9254a62cd612f2d1383c249f5a3c72354cf22b08
Component: engine
2014-06-11 00:54:52 +10:00
Sven Dowideit
f41579c1d4
Merge pull request #6300 from whatthejeff/patch-1
...
Avoid history expansion.
Upstream-commit: b83a171f9e4851040724ae44d39ba371a80310c4
Component: engine
2014-06-11 00:49:29 +10:00
Tianon Gravi
4e8352c6cd
Merge pull request #6252 from tianon/update-check-config
...
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
Upstream-commit: 5ff3a28cb4955b5d933c17d0d9c6f8f0b6267d7d
Component: engine
2014-06-10 08:09:34 -06:00
Levi Gross
bef7d7d621
Fixed up if statement
...
Signed-off-by: Levi Gross <levi@levigross.com >
Docker-DCO-1.1-Signed-off-by: Levi Gross <levi@levigross.com > (github: levigross)
Upstream-commit: a7b60b21deaf7dbc3b5741be036bfb2a6679f1c8
Component: engine
2014-06-10 10:02:00 -04:00
Cruceru Calin-Cristian
9b5969a515
Repaired broken links
...
Docker-DCO-1.1-Signed-off-by: Calin Cruceru <crucerucalincristian@gmail.com > (github: crucerucalin)
Upstream-commit: 53802d54d6e2d322f4cd13e2cc6c294e73ef8b4e
Component: engine
2014-06-10 08:21:12 +03:00
Erik Hollensbe
3ad02e9ae6
Improve documentation on Ubuntu for getting the latest release of
...
docker.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7ab1a90e59b34abda1d2ffa1dd6683302927d9ec
Component: engine
2014-06-09 18:31:46 -07:00
unclejack
70824b0aaa
Merge pull request #6317 from crosbymichael/libcontainerdep
...
Move libcontainer deps into libcontainer
Upstream-commit: fb2ac5bedb4e3e3d624dd8f4a4c595e066138a51
Component: engine
2014-06-10 03:16:15 +03:00
Michael Crosby
b00f7d0626
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bae6a5a616cfc382f45a25af13633681875ddff0
Component: engine
2014-06-09 16:01:57 -07:00
Michael Crosby
3c7670e68c
Move libcontainer deps into libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6158ccad97db51e756aafefb096d1163aa4d6439
Component: engine
2014-06-09 15:52:12 -07:00
Jeff Welch
5c1c8409ec
Avoid history expansion.
...
Docker-DCO-1.1-Signed-off-by: Jeff Welch <whatthejeff@gmail.com > (github: whatthejeff)
Upstream-commit: 052ad32a7b0dc93dafe7a27034b6911d6a71e849
Component: engine
2014-06-09 17:30:34 -04:00
Michael Crosby
2cf64a9662
Merge pull request #6305 from crosbymichael/merge_release_v1.0.0
...
Merge release v1.0.0
Upstream-commit: fd32fc80625c8e608332f48d69c1801c23a6ffa4
Component: engine
2014-06-09 07:17:43 -07:00
Michael Crosby
5b45d1841a
Change version to v1.0.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: faf5ef6f80632db948e112fcb1e29a53562ad0c8
Component: engine
2014-06-09 07:14:51 -07:00
Michael Crosby
8845816a75
Merge branch 'release' into merge_release_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 07e9ac9ffedc07b92ac446fc6a9e7ad1f21e3301
Component: engine
2014-06-09 07:14:40 -07:00
Michael Crosby
76b1ae4677
Merge pull request #6303 from crosbymichael/bump_v1.0.0
...
Bump version to v1.0.0
Upstream-commit: d9939758e6a02cbd42e01635166fc168ef0470dd
Component: engine
2014-06-09 07:12:42 -07:00
James Turnbull
c87123a2be
Merge pull request #6302 from Costent/patch-1
...
Update windows.md
Upstream-commit: 5dc6339e33452ed071fe5f93d49d0f6068ff106d
Component: engine
2014-06-09 06:14:16 -07:00
William Riancho
9c48187761
Update windows.md
...
Replace "OS X" by "Windows"
Upstream-commit: 875d0b776d0ec4ba68491f82143e6f099a03944a
Component: engine
2014-06-09 11:23:54 +02:00
Sven Dowideit
89ba3efbb5
Merge pull request #6299 from jamtur01/12link
...
Fixed API 1.12 links and misc other fixes
Upstream-commit: e2fce7d61284c2b3a472bdb25eab082b66f82c54
Component: engine
2014-06-08 18:06:27 -07:00
James Turnbull
5d75749431
Merge pull request #6297 from jamtur01/hub
...
Updated Docker Hub documentation
Upstream-commit: 135ced208cf652f65a9197a7a5e156cb6a1f4507
Component: engine
2014-06-08 18:03:28 -07:00
James Turnbull
6285d5504f
Updated Docker Hub documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 871299de0d08242aa6afd9f7ffd4d96e81905331
Component: engine
2014-06-08 18:01:44 -07:00
James Turnbull
a88207cb57
Fixed API 1.12 links and misc other fixes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 11fee48c2daa254a724836cad59cced7dc96e267
Component: engine
2014-06-08 17:59:22 -07:00
James Turnbull
64028c6451
Merge pull request #6298 from fredlf/copyedits
...
Edits to Win and OSX install
Upstream-commit: 3b0ae3ec68247424ffa3784f6faaf1ca5ff68570
Component: engine
2014-06-08 17:56:34 -07:00
Fred Lifton
56d2049094
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9e2e8188ae8e2c566b3e10c1b23ae3fff8f9d64a
Component: engine
2014-06-08 17:36:49 -07:00
Fred Lifton
effedf34e2
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9bc75d008e66eb15b85ac32134e654e07ae9bb7e
Component: engine
2014-06-08 17:35:49 -07:00
Sven Dowideit
96f2c6b763
Merge pull request #6295 from ostezer/docs-ref-index-hub
...
Docs: Rename index with hub for ref. section
Upstream-commit: a43cebf08897c841ad2948ab53568bf89d5e6fee
Component: engine
2014-06-08 16:47:48 -07:00
Sven Dowideit
e8985434e5
Merge pull request #6265 from fredlf/copyedits
...
Copyedits
Upstream-commit: 83b446492c2fd7675809231d4934127db8d620ad
Component: engine
2014-06-08 16:47:12 -07:00
Fred Lifton
a67ce8a53c
Copy edits to Understanding Docker
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
Upstream-commit: 4fd9cc9980d9ef5a788a9163287fb50e13669cdb
Component: engine
2014-06-08 16:46:31 -07:00
Michael Crosby
35f8f058d8
Bump to version v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 63fe64c471e7d76be96a625350468dfc65c06c31
Component: engine
2014-06-08 16:42:30 -07:00
Michael Crosby
95f4352346
Merge branch 'master' into bump_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9722c66dadace81be5db7326e2904e34591614bb
Component: engine
2014-06-08 16:40:19 -07:00
O.S. Tezer
c408832b20
Docs: Rename index with hub for ref. section
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: b0a46d1cb981418f6447b7bc43db907367b77829
Component: engine
2014-06-08 16:34:47 -07:00
unclejack
0df7356ec5
Merge pull request #6293 from vieux/fix_version_decode
...
Fix version numbering
Upstream-commit: e570987c4f83239aa342f137216f44dfe42b1a3f
Component: engine
2014-06-09 02:23:27 +03:00
Sven Dowideit
f9d5535dba
Merge pull request #6294 from SvenDowideit/simplify-windows-networking-docs
...
Simplify the windows docs and fix formatting
Upstream-commit: c740c760173ccf09afadd4dce6c6e07e23b29692
Component: engine
2014-06-08 16:14:54 -07:00