4d16453ae7
Merge pull request #6430 from LK4D4/lock_inspect
...
Do inspect under container lock
Upstream-commit: d671768b52a43f27755d10245917103dea6b7416
Component: engine
2014-06-16 15:31:08 -07:00
5a4f568984
Issue #5279 -> Introduce horizontal scrolling to code-blocks
...
Closes issue #5279
This commit re-introduces horizontal scrolling to docs' codeblocks
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7a7bb43db5ecea4dd08af016a2528d0722bf79ac
Component: engine
2014-06-16 13:29:20 -07:00
203a0f3ec5
Merge pull request #6425 from tianon/fix-man-page-spelling-errors
...
Fix several man page spelling errors
Upstream-commit: a6ce867e48cdfaafdca7344bd2df9c29cdd20cbe
Component: engine
2014-06-16 13:24:10 -06:00
bee288d0b6
Merge pull request #6304 from glyn/mac-build-no-sudo
...
Do not build using sudo on Mac OS X
Upstream-commit: 4e20407d8260657bc823d6d02120972d718222b3
Component: engine
2014-06-16 09:45:52 -04:00
26c642c4fd
Do not build using sudo on Mac OS X
...
Building using sudo fails on Mac OS X, but is necessary on Linux.
See https://groups.google.com/d/topic/docker-dev/1EW_pfA1t9o/discussion for discussion.
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com > (github: glyn)
Upstream-commit: 1c05ddd645c50102321274ec7595c8b62dd71335
Component: engine
2014-06-16 14:39:48 +01:00
76dc816a6e
Guillaume is busy full-time on his new business, and no longer available
...
as a maintainer.
Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
2014-06-16 06:22:15 -07:00
86dabfb5d3
Merge pull request #6443 from catharsis/patch-1
...
dockervolumes: Fix a minor typo
Upstream-commit: 7085ec875fbfe927e555d1bdc485654682d698ab
Component: engine
2014-06-16 09:09:32 -04:00
9246d93b3c
Merge pull request #6437 from jamtur01/net
...
Fixed headers and ' characters
Upstream-commit: 2b468dc283d1379dd7d24dbdae4de8c92b2ae9ab
Component: engine
2014-06-16 20:19:03 +10:00
b82599c74a
dockervolumes: Fix a minor typo
...
Upstream-commit: 8df0b12d821d5a57051e9a92bc8687ac893deb3f
Component: engine
2014-06-16 09:52:23 +02:00
db3540c189
Merge pull request #6378 from evanderkoogh/patch-1
...
Linking containers added to API example
Upstream-commit: 50d49d0db887453b6c5483c9086cbdb68ad466d2
Component: engine
2014-06-15 20:29:50 -04:00
b025f435dc
Merge pull request #6433 from soulshake/small-typos
...
Fix spelling and grammar errors; remove seemingly out-of-place words
Upstream-commit: 50fde602a1f1ddf3c388bf33bb02d9486e9fa7b0
Component: engine
2014-06-15 11:36:19 -07:00
9cacf9c04c
docker-java has moved to new location
...
Upstream-commit: 520163a00ee22ddb3d689f7304db2af2784d3bdb
Component: engine
2014-06-15 20:16:51 +02:00
6e2a69bea8
Fixed headers and ' characters
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 4adab34dfa9d3e128d022522adfc95c0a47dd8e0
Component: engine
2014-06-15 12:15:59 -04:00
288f2b5878
Fix spelling and grammar errors; remove seemingly out-of-place words
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: be9dcbbef5961357117448976411be155daac019
Component: engine
2014-06-15 01:18:11 +02:00
99ccd1838c
Fix several typos
...
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at > (github: mika)
Upstream-commit: c0c58b6b46626c0ae5cc9c0b37519c505f5a8484
Component: engine
2014-06-14 23:16:30 +02:00
f5efd485e9
Do inspect under container lock
...
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 947405a90951e4715a8399410b67f4f644415d59
Component: engine
2014-06-14 21:08:23 +04:00
839293c4cd
Fix missing leading slash for /bin/bash executable
...
Upstream-commit: e9f1f760f220cbd0f3df68b09ab8c10b27dfa0e9
Component: engine
2014-06-14 15:54:27 +02:00
cb48ac70c7
Fix several man page spelling errors
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: cb92c4714460aff9fc5c06c2daa3fd1474d77ef5
Component: engine
2014-06-14 01:49:51 -06:00
61604356ac
Merge pull request #6386 from cpuguy83/fix_link_docs
...
Adds info on how to get env vars from container
Upstream-commit: c40602b25483d7bf6e58b715717ade0ad9541b11
Component: engine
2014-06-13 23:12:32 -07:00
9ecc7d002d
Fixed whitespace errors
...
Upstream-commit: 1a441d9aeaf929abb89958675018ebc5e0868844
Component: engine
2014-06-13 17:08:53 -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
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
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
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
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
ab4671a371
Linking containers added to API example
...
Linking containers was not covered in the API documentation. I looked it up in the client source code and testing it manually.
Upstream-commit: 0bdadfe4e7547f58c7c32582c61912dfe1fc7302
Component: engine
2014-06-12 17:15:14 +08: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
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
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
