Jonathan Boulle
6d14e9f1ac
be consistent in capitalization of Docker
...
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
2014-06-20 14:05:46 -07:00
unclejack
a5f5d5e8d7
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
2014-06-20 23:55:10 +03:00
Michael Crosby
8ee1f2a9e9
Merge pull request #6516 from LK4D4/validate_logs_params
...
Validate that one of streams choosen in logs on api side
2014-06-20 13:43:31 -07:00
Michael Crosby
189967a12a
Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
...
More verbose error for parallel pull
2014-06-20 13:29:51 -07:00
Vincent Batts
d3bc787bca
docker save: raw json
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-06-20 14:38:17 -04:00
Matthew Heon
f55fa8211b
Escape control and nonprintable characters in docker ps
...
The docker ps command displays the user-entered command running in a container.
If that command contained \n, \t, or other control characters, they were
interpreted literally, and newlines and tabs would be printed in the output.
Escape the command string to make things more readable.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
2014-06-20 12:22:31 -04:00
Tianon Gravi
a206186f84
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
...
This also adds support for squeeze-lts. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-20 10:11:26 -06:00
Brian Goff
ff1ea0064b
Add cpuguy83 as volumes maintainer
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-06-20 09:40:29 -04:00
Sven Dowideit
b2eb79b7da
Merge pull request #6565 from shaunol/patch-1
...
Update windows.md
2014-06-20 23:27:12 +10:00
Sven Dowideit
ed833bb62d
Merge pull request #6568 from jokajak/patch-2
...
Minor typo/format fixes for dockerlinks.md
2014-06-20 23:23:03 +10:00
James Turnbull
0d63d68e33
Merge pull request #6540 from lalyos/docs-installation-mac-windows
...
Fix installation docs to use the new boot2docker command: ip
2014-06-20 08:02:56 -05:00
James Turnbull
a32f3b4b50
Merge pull request #6566 from jokajak/patch-1
...
Fix typo in networking.md
2014-06-20 07:59:35 -05:00
Josh
66bccf3064
Minor typo/format fixes
...
This fixes a code block typo so it renders as a code block. Additionally synchronizes the variable prefix examples from 'DB' and 'DB1_' to 'DB_' and 'DB1_'
2014-06-20 07:49:22 -04:00
Sven Dowideit
c60cde1499
Merge pull request #6564 from financeCoding/docs-installation-google-fix
...
full url to GCE image
2014-06-20 21:41:35 +10:00
Josh
cbdce9912d
Fix typo in networking.md
...
Minor typo fix
2014-06-20 07:14:56 -04:00
shaunol
db9bf744ab
Update windows.md
...
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
2014-06-20 19:23:35 +12:00
Adam Singer
4efe02b3df
full url to GCE image
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
2014-06-19 22:01:10 -07:00
James Turnbull
4e286a9094
Merge pull request #6548 from jamtur01/sec
...
Fixed #6545 - Updated Security article
2014-06-19 20:21:07 -05:00
Victor Vieux
8554841c6a
Merge pull request #6563 from vieux/merge_release_v1.0.1
...
Merge release v1.0.1
2014-06-19 18:09:07 -07:00
Victor Vieux
49376ec448
Change version to 1.0.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-20 01:06:48 +00:00
Victor Vieux
7030cdce59
Merge pull request #6559 from vieux/bump_v1.0.1
...
Bump v1.0.1
2014-06-19 18:03:54 -07:00
Victor Vieux
990021ac2b
Bump version to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-19 23:11:34 +00:00
Victor Vieux
41d405fa53
Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1
...
Update libcontainer dep to v1.0.1
2014-06-19 15:43:30 -07:00
Michael Crosby
8d06bfc12e
Update libcontainer dep to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-19 15:23:19 -07:00
Tianon Gravi
98ea12ac38
Merge pull request #6554 from tianon/fix-dyntest
...
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
2014-06-19 16:04:24 -06:00
Victor Vieux
7ba8788919
Merge pull request #6527 from subhraveti/cap-whitelist
...
Maintain a whitelist of capabilities rather than droplist
2014-06-19 14:48:38 -07:00
James Turnbull
bf69b773ec
Fixed #6545 - Updated Security article
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-19 16:13:20 -05:00
Tianon Gravi
986a151b8a
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 15:06:34 -06:00
Michael Crosby
abda245ddc
Merge pull request #6493 from vieux/fix_cp_mac_os
...
allow utimes on mac os, only lutimes isn't supported
2014-06-19 14:00:59 -07:00
Tibor Vass
4ad5af81c8
Merge pull request #6552 from vbatts/vbatts-gh6551
...
sqlite-3.6.20-1 unique constraint message
2014-06-19 16:54:43 -04:00
Tianon Gravi
3f7909e996
Disable netgo for dynbinary builds
...
It's not necessary to use the netgo implementation for non-static builds. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 14:35:30 -06:00
Michael Crosby
707ef9618b
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-19 16:02:21 -04:00
Michael Crosby
d31ae5aed8
Use libcontainer cap drop method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-19 16:00:53 -04:00
Vincent Batts
b4857dffa8
sqlite-3.6.20-1 unique constraint message
...
https://github.com/dotcloud/docker/issues/6551
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-06-19 15:24:22 -04:00
Tianon Gravi
2eac1c4bc5
Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags
...
Update bash-completion to reflect ability to push single tags
2014-06-19 12:40:31 -06:00
LK4D4
d17c929659
Fix stdcopy when reads large frame at once
...
Fixes TestLogsContainerMuchBiggerThanPage with go 1.3(#6520 )
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-19 21:42:55 +04:00
Tianon Gravi
bdf4b74b52
Update bash-completion to reflect ability to push single tags
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 10:11:32 -06:00
James Turnbull
346a350df4
Merge pull request #6538 from leeplay/patch-2
...
Update dockerlinks.md
2014-06-19 10:59:48 -05:00
unclejack
181e54bff3
Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren
...
Ensure that ONBUILD triggers aren't committed to grandchildren
2014-06-19 18:11:33 +03:00
Kevin "qwazerty" Houdebert
d7e5fdfb58
Fix minor typo
...
Docker-DCO-1.1-Signed-off-by: Kevin Houdebert kevin.houdebert@gmail.com (github: qwazerty)
2014-06-19 14:49:52 +02:00
James Turnbull
10eae16fa7
Updated SSH example to ensure it continues working
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-19 07:44:41 -05:00
James Turnbull
874698cb4a
Merge pull request #6524 from behemphi/patch-1
...
Update dockerizing.md
2014-06-19 07:06:02 -05:00
lalyos
40966fa096
Fix installation docs to use the new boot2docker command: ip
...
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
2014-06-19 13:00:45 +02:00
cyphar
a57298791c
integration-cli: add build test for NOCACHE
...
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-19 20:33:17 +10:00
cyphar
7303467c77
server: buildfile: ensure that ONBUILD triggers aren't committed
...
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped *after* all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
*before* committing anything.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-19 20:33:17 +10:00
hyeongkyu.lee
7b1f34d626
Update dockerlinks.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
2014-06-19 18:45:31 +09:00
David Gageot
80bc06f1cf
Fix flag names
2014-06-19 11:25:14 +02:00
Dinesh Subhraveti
cf331cdd6a
Maintain a whitelist of capabilities rather than droplist
...
This fixes 6/18 vulnerability
Docker-DCO-1.1-Signed-off-by: Dinesh Subhraveti <dineshs@altiscale.com> (github: dineshs-altiscale)
2014-06-19 03:34:04 -04:00
James Turnbull
b1c114c3a7
Merge pull request #6519 from fredlf/latest-copyedits
...
Copy edits to dockerhub.md, fixed a broken link.
2014-06-19 01:45:20 -05:00
Tianon Gravi
b13cdb01bd
Merge pull request #6427 from tianon/fix-zsh-completion-mode
...
Fix mode on contrib/completion/zsh/_docker (-x)
2014-06-18 23:01:07 -06:00