Commit Graph

8850 Commits

Author SHA1 Message Date
9ecc7d002d Fixed whitespace errors
Upstream-commit: 1a441d9aeaf929abb89958675018ebc5e0868844
Component: engine
2014-06-13 17:08:53 -07:00
74db970f2e Merge pull request #6421 from nathanleclaire/doc_fix
Note user name and password in docs on boot2docker
Upstream-commit: 821d3aab65a8f9774e88ed0497f0e6e78a1548fc
Component: engine
2014-06-13 16:03:39 -07:00
1dbb9e510c Note user name and password in docs on boot2docker
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com> (github: nathanleclaire)
Upstream-commit: 073382a9c61fb73b8d1915bf53fa6e8c5bd8fbb8
Component: engine
2014-06-13 15:38:45 -07:00
34d7adb0ad Merge pull request #6416 from danielnorberg/dano/docs-spotify-client
docs: add spotify docker-client link
Upstream-commit: 77b09a6a19e870164dae4edcbcce43284a79fba4
Component: engine
2014-06-13 12:08:17 -07:00
dfd42b4d5f docs: add spotify docker-client link
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 27b2d7ff7245ad57dcaa7f9ce8eeeee743373a85
Component: engine
2014-06-13 14:20:31 -04:00
8316cc33c5 Merge pull request #6411 from alazaro/patch-1
Fix typo
Upstream-commit: 7b366b1f01b2b410fb7587c7f01755be09239510
Component: engine
2014-06-13 08:15:29 -07:00
fce019ee42 Fix typo
Upstream-commit: 52e88d92f0cceb9caa13160febcfe046732e0b86
Component: engine
2014-06-13 15:53:42 +02:00
5a4d61b92a Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
Fix some more race conditions
Upstream-commit: 51b188c5102e86ad453c933077bcaf9594070c28
Component: engine
2014-06-12 15:17:10 -07:00
28b97cf916 Merge pull request #6391 from vieux/fix_hostname_file_net_host
fix hostname generation with --net=host
Upstream-commit: 8091157038fe582d5d674cc743c87b808036d80d
Component: engine
2014-06-12 14:11:26 -07:00
4c7bb47c22 Merge pull request #6381 from glyn/prod-ready
Remove "production ready" from the roadmap
Upstream-commit: d871725cf267e986e29fed4360b3a46a964b9bd4
Component: engine
2014-06-12 14:02:51 -07:00
dab360c397 Merge pull request #6360 from vieux/remove_beam
remove unused beam, will be back later as libchan
Upstream-commit: f9f6379a533adefddef367b9310e91c8c21c2727
Component: engine
2014-06-12 13:55:53 -07:00
e3ce3684c5 Merge pull request #6365 from vieux/allow_net_none_h
Allow --net=none and -h
Upstream-commit: 15243cdbde92018b7dc59e5d17edebe895fb0b4b
Component: engine
2014-06-12 12:26:54 -07:00
c99ab31438 add hostname generation with --net=host
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f5979b9d0dd993a00e064114218ccdbfdaab9fe0
Component: engine
2014-06-12 19:20:57 +00:00
13764748a8 add test
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 9494643bf1fcd38974266555e59e1b2d2573c418
Component: engine
2014-06-12 19:11:51 +00:00
5591b84fff Merge pull request #6307 from W4RH4WK/master
restore logo for README.md
Upstream-commit: a8d6d28be4d1a9a5393ee7a268c964c555fc93c5
Component: engine
2014-06-12 10:21:10 -07:00
f612478eca Remove "production ready" from the roadmap
It's done as of v1.0.0.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Upstream-commit: 784a008346e9d0e3829bd08b6fc07cdcfc09bd82
Component: engine
2014-06-12 14:21:20 +01:00
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
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
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
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
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
1a7abd252b add tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 6cb16f1c316c55e3b6108d178ffcde2e705cbe47
Component: engine
2014-06-11 21:15:48 +00:00
62d142653c Allow --net=none & -h
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f411f8bfc5d04aed6499dfc90e357c58713bc84d
Component: engine
2014-06-11 21:07:50 +00:00
99dc4301cc remove unused beam, will be back later as libchan
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 384b60b940e07d37c1ff544168a2407513114d80
Component: engine
2014-06-11 19:09:55 +00:00
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
1ddec5f792 Merge pull request #6357 from crosbymichael/vendor-libcontainer
Vendor libcontainer
Upstream-commit: 6c953a305976c8270d8d5f2b14a169bc21703abb
Component: engine
2014-06-11 10:57:39 -07:00
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
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
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
f9497861c8 Fix race in LogEvent
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: a1b7a35c90f05b113b7c3aa474b74d1d2afbf7b6
Component: engine
2014-06-11 15:23:33 +04:00
5c1bb534bb Fix race in get/set HostConfig
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: fa7c8d523e8d899ade547fcaacc34a739ab5044f
Component: engine
2014-06-11 15:23:33 +04:00
ab194686ba Fix race in contStore.List
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 0b3fe5544266b6f9657ecd87989b85b535cc63e1
Component: engine
2014-06-11 15:23:33 +04:00
f73a57c5b6 minor spelling fix
Upstream-commit: db00e224c2ae76096490c29357ef041ded7fadfc
Component: engine
2014-06-11 13:16:53 +02:00
30903b9316 Fix some bullet points so they render correctly.
Upstream-commit: a247af9c97be92f91242db51f4a9545db1bda702
Component: engine
2014-06-11 11:44:30 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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