James Turnbull
0b97725340
Fixed DOCKER_OPTS
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-15 12:26:52 -04:00
James Turnbull
4adab34dfa
Fixed headers and ' characters
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-15 12:15:59 -04:00
AJ Bowen
be9dcbbef5
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)
2014-06-15 01:18:11 +02:00
Sven Dowideit
c4327f7146
Merge pull request #6431 from mika/mika/typos
...
Fix several typos
2014-06-15 07:51:48 +10:00
Michael Prokop
c0c58b6b46
Fix several typos
...
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at> (github: mika)
2014-06-14 23:16:30 +02:00
LK4D4
947405a909
Do inspect under container lock
...
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-14 21:08:23 +04:00
James Turnbull
93bf556f13
Merge pull request #6429 from mika/patch-1
...
Fix missing leading slash for /bin/bash executable
2014-06-14 11:07:38 -04:00
Michael Prokop
e9f1f760f2
Fix missing leading slash for /bin/bash executable
2014-06-14 15:54:27 +02:00
Tianon Gravi
e02cf69789
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-14 01:59:52 -06:00
Tianon Gravi
cb92c47144
Fix several man page spelling errors
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-14 01:49:51 -06:00
Tianon Gravi
d561fe6d2d
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-14 01:44:55 -06:00
O.S. Tezer
c40602b254
Merge pull request #6386 from cpuguy83/fix_link_docs
...
Adds info on how to get env vars from container
2014-06-13 23:12:32 -07:00
Fred Lifton
1a441d9aea
Fixed whitespace errors
2014-06-13 17:08:53 -07:00
O.S. Tezer
821d3aab65
Merge pull request #6421 from nathanleclaire/doc_fix
...
Note user name and password in docs on boot2docker
2014-06-13 16:03:39 -07:00
Nathan LeClaire
073382a9c6
Note user name and password in docs on boot2docker
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com> (github: nathanleclaire)
2014-06-13 15:38:45 -07:00
O.S. Tezer
77b09a6a19
Merge pull request #6416 from danielnorberg/dano/docs-spotify-client
...
docs: add spotify docker-client link
2014-06-13 12:08:17 -07:00
Mrunal Patel
65567e125d
Add helper function to make prctl system call.
...
Docker-DCO-1.1-Signed-off-by: Mrunal Patel <mrunalp@gmail.com> (github: mrunalp)
2014-06-13 11:49:57 -07:00
Daniel Norberg
27b2d7ff72
docs: add spotify docker-client link
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
2014-06-13 14:20:31 -04:00
LK4D4
eb97163348
Increase time before exit in TestMultipleAttachRestart
...
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-13 21:40:30 +04:00
James Turnbull
7b366b1f01
Merge pull request #6411 from alazaro/patch-1
...
Fix typo
2014-06-13 08:15:29 -07:00
Álvaro Lázaro
52e88d92f0
Fix typo
2014-06-13 15:53:42 +02:00
Michael Crosby
51b188c510
Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
...
Fix some more race conditions
2014-06-12 15:17:10 -07:00
Tibor Vass
8091157038
Merge pull request #6391 from vieux/fix_hostname_file_net_host
...
fix hostname generation with --net=host
2014-06-12 14:11:26 -07:00
Michael Crosby
d871725cf2
Merge pull request #6381 from glyn/prod-ready
...
Remove "production ready" from the roadmap
2014-06-12 14:02:51 -07:00
Victor Vieux
f9f6379a53
Merge pull request #6360 from vieux/remove_beam
...
remove unused beam, will be back later as libchan
2014-06-12 13:55:53 -07:00
Victor Vieux
15243cdbde
Merge pull request #6365 from vieux/allow_net_none_h
...
Allow --net=none and -h
2014-06-12 12:26:54 -07:00
Victor Vieux
f5979b9d0d
add hostname generation with --net=host
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-12 19:20:57 +00:00
Victor Vieux
9494643bf1
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-12 19:11:51 +00:00
Michael Crosby
a8d6d28be4
Merge pull request #6307 from W4RH4WK/master
...
restore logo for README.md
2014-06-12 10:21:10 -07:00
Brian Goff
fbf7815b25
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)
2014-06-12 09:26:55 -07:00
Glyn Normington
784a008346
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)
2014-06-12 14:21:20 +01:00
evanderkoogh
0bdadfe4e7
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.
2014-06-12 17:15:14 +08:00
O.S. Tezer
dbee7dd69e
Merge pull request #6372 from ostezer/docs-fix-logged-in-hdr
...
Docs: Fixed logged-in header username label target
2014-06-12 01:17:38 -07:00
Tianon Gravi
3b9e8679db
Merge pull request #6361 from asbjornenge/tmlang_copy
...
Add contribute/syntax highlight for the COPY instruction
2014-06-12 00:06:51 -07:00
Asbjørn Enge
cb47ddd968
Added highlight for the COPY instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-06-12 08:25:09 +02:00
O.S. Tezer
4ccd91f0d8
Docs: Fixed logged-in header username label target
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-11 18:09:43 -07:00
Michael Crosby
c99ee556d4
Merge pull request #6060 from dineshs-altiscale/maintainers
...
Add Dinesh Subhraveti to MAINTAINERS
2014-06-11 14:37:01 -07:00
Victor Vieux
6cb16f1c31
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 21:15:48 +00:00
Victor Vieux
f411f8bfc5
Allow --net=none & -h
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 21:07:50 +00:00
Johan Euphrosine
37115ffb00
MAINTAINERS: add proppy for google.md
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-06-11 13:55:47 -07:00
Victor Vieux
384b60b940
remove unused beam, will be back later as libchan
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-11 19:09:55 +00:00
Michael Crosby
9ac293e1a8
Merge pull request #6335 from levigross/master
...
Fixed up if statement
2014-06-11 11:51:57 -07:00
Michael Crosby
6c953a3059
Merge pull request #6357 from crosbymichael/vendor-libcontainer
...
Vendor libcontainer
2014-06-11 10:57:39 -07:00
unclejack
8f909221f5
Merge pull request #6277 from philips/remove-unneeded-time-duration
...
registry: remove unneeded time.Duration()
2014-06-11 20:33:22 +03:00
James Turnbull
96c03d6d92
Merge pull request #6351 from lenw/patch-1
...
minor spelling fix
2014-06-11 06:55:33 -07:00
James Turnbull
a092f979d4
Merge pull request #6349 from chrismckinnel/master
...
Fix some bullet points so they render correctly.
2014-06-11 06:54:44 -07:00
Alexandr Morozov
a1b7a35c90
Fix race in LogEvent
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
fa7c8d523e
Fix race in get/set HostConfig
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Alexandr Morozov
0b3fe55442
Fix race in contStore.List
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-11 15:23:33 +04:00
Len Weincier
db00e224c2
minor spelling fix
2014-06-11 13:16:53 +02:00