ac51920bca
Clean up some uses on 'an' in builder docs
...
Upstream-commit: 5266d6fa7bc367ac4c7472550b7220c4eb06731f
Component: engine
2014-06-20 22:36:31 +01:00
6884fb8621
Fix minor typo and improve wording
...
Upstream-commit: 1bcc37caec07c01ab385f562ffa56d2b2bb0a7d8
Component: engine
2014-06-20 22:21:18 +01:00
929a82a086
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
23fd1b998a
Merge pull request #6516 from LK4D4/validate_logs_params
...
Validate that one of streams choosen in logs on api side
Upstream-commit: 8ee1f2a9e9dc1ef025b1551f1f5b676116c83cfa
Component: engine
2014-06-20 13:43:31 -07:00
c6816e3f6c
Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
...
More verbose error for parallel pull
Upstream-commit: 189967a12ae6a7be994238054086b23115d25548
Component: engine
2014-06-20 13:29:51 -07:00
dcfc8d37e9
docker save: raw json
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: d3bc787bca62edff384e06a12224be2d982353da
Component: engine
2014-06-20 14:38:17 -04:00
fcdeff83df
Merge pull request #6565 from shaunol/patch-1
...
Update windows.md
Upstream-commit: b2eb79b7dad44fcbfac31565bec3763bb7ec796c
Component: engine
2014-06-20 23:27:12 +10:00
8b9e10c4f9
Merge pull request #6568 from jokajak/patch-2
...
Minor typo/format fixes for dockerlinks.md
Upstream-commit: ed833bb62d63ae037a91d38df617def548f3737a
Component: engine
2014-06-20 23:23:03 +10:00
1d18ac109a
Merge pull request #6540 from lalyos/docs-installation-mac-windows
...
Fix installation docs to use the new boot2docker command: ip
Upstream-commit: 0d63d68e33d0c74985482aafdd8a3c3c2f757efb
Component: engine
2014-06-20 08:02:56 -05:00
b6eb05620c
Merge pull request #6566 from jokajak/patch-1
...
Fix typo in networking.md
Upstream-commit: a32f3b4b50820d5d04b10948dab3dc9a13f01ae1
Component: engine
2014-06-20 07:59:35 -05:00
e3cc01df51
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_'
Upstream-commit: 66bccf3064effd910e47405dc738ba08a8d14b12
Component: engine
2014-06-20 07:49:22 -04:00
fc6c3567e1
Merge pull request #6564 from financeCoding/docs-installation-google-fix
...
full url to GCE image
Upstream-commit: c60cde14990a4d3b502af19895e2c8bbabd0f9ba
Component: engine
2014-06-20 21:41:35 +10:00
4982ce8f2c
Fix typo in networking.md
...
Minor typo fix
Upstream-commit: cbdce9912d9f904b237e29dd2a1196367337628b
Component: engine
2014-06-20 07:14:56 -04:00
c160f0471c
Update windows.md
...
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
Upstream-commit: db9bf744ab93f1e688bf986794c852abc40b873e
Component: engine
2014-06-20 19:23:35 +12:00
64dc347e88
full url to GCE image
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com > (github: financeCoding)
Upstream-commit: 4efe02b3df67af544d398e435fbe567502bf0dea
Component: engine
2014-06-19 22:01:10 -07:00
7c71f92cb5
Merge pull request #6548 from jamtur01/sec
...
Fixed #6545 - Updated Security article
Upstream-commit: 4e286a9094dc52a5dd709fd11787c8fb6b6fe38d
Component: engine
2014-06-19 20:21:07 -05:00
7fabfe41f5
Merge pull request #6563 from vieux/merge_release_v1.0.1
...
Merge release v1.0.1
Upstream-commit: 8554841c6a614a894bbe708e724d50b4a8f0a86b
Component: engine
2014-06-19 18:09:07 -07:00
9f5b3a4e1b
Change version to 1.0.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 49376ec4483c241167f7623ccc0260486ce8d4a3
Component: engine
2014-06-20 01:06:48 +00:00
10cd020262
Merge pull request #6559 from vieux/bump_v1.0.1
...
Bump v1.0.1
Upstream-commit: 7030cdce59f5ae50220ea72c26a7f8b6a125c0ca
Component: engine
2014-06-19 18:03:54 -07:00
8e533cce58
Bump version to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 990021ac2b4a4c8e6ae66dd331c372f70eec3b7a
Component: engine
2014-06-19 23:11:34 +00:00
3be2fcd18e
Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1
...
Update libcontainer dep to v1.0.1
Upstream-commit: 41d405fa5387b0c0a84aea0a41a5ce84e1dd5231
Component: engine
2014-06-19 15:43:30 -07:00
beca1cc741
Update libcontainer dep to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 8d06bfc12ec62b8276b2db22e049d40dde016c9f
Component: engine
2014-06-19 15:23:19 -07:00
9254e8e818
Merge pull request #6554 from tianon/fix-dyntest
...
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
Upstream-commit: 98ea12ac3864239127ae3a9d2aa2d93a72aa5e61
Component: engine
2014-06-19 16:04:24 -06:00
cd49e29a76
Merge pull request #6527 from subhraveti/cap-whitelist
...
Maintain a whitelist of capabilities rather than droplist
Upstream-commit: 7ba8788919bf6ddb5de626f3b1b89c497eed4b86
Component: engine
2014-06-19 14:48:38 -07:00
af26e461d3
Fixed #6545 - Updated Security article
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: bf69b773ec4c817dcc276e4471fc85f762f18f9f
Component: engine
2014-06-19 16:13:20 -05:00
d1de6bfa90
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)
Upstream-commit: 986a151b8afe59b33097235a5964f78fc1a55521
Component: engine
2014-06-19 15:06:34 -06:00
5d2f394b9a
Merge pull request #6493 from vieux/fix_cp_mac_os
...
allow utimes on mac os, only lutimes isn't supported
Upstream-commit: abda245ddc38200b6ad24f79d194e6f4125a0100
Component: engine
2014-06-19 14:00:59 -07:00
b7d9a978a2
Merge pull request #6552 from vbatts/vbatts-gh6551
...
sqlite-3.6.20-1 unique constraint message
Upstream-commit: 4ad5af81c8394011b63b427a1328a472b615b233
Component: engine
2014-06-19 16:54:43 -04:00
16f6e09488
Update close fd issues for lxc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 707ef9618b3b26a0534a0af732a22f159eccfaa5
Component: engine
2014-06-19 16:02:21 -04:00
1316dc9e2d
Use libcontainer cap drop method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: d31ae5aed80eeb40a461930776ad2b507804bf4e
Component: engine
2014-06-19 16:00:53 -04:00
3557a3b077
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)
Upstream-commit: b4857dffa8ba0a7b2fe779a0b2264ce1b0b2e7ff
Component: engine
2014-06-19 15:24:22 -04:00
d94d81180e
Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags
...
Update bash-completion to reflect ability to push single tags
Upstream-commit: 2eac1c4bc5e3b77a99d94811cc481bc27b648ee0
Component: engine
2014-06-19 12:40:31 -06:00
a9640bbe8b
Update bash-completion to reflect ability to push single tags
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: bdf4b74b52cb313a869a0b15d1eb315a79e1cd52
Component: engine
2014-06-19 10:11:32 -06:00
2f32938e9d
Merge pull request #6538 from leeplay/patch-2
...
Update dockerlinks.md
Upstream-commit: 346a350df4a9f8b6dac25d2b341fcc84139a46ad
Component: engine
2014-06-19 10:59:48 -05:00
041fa8eb57
Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren
...
Ensure that ONBUILD triggers aren't committed to grandchildren
Upstream-commit: 181e54bff3ecc6ea8d27910d52b4aea2709c42c2
Component: engine
2014-06-19 18:11:33 +03:00
76247f5a34
Merge pull request #6524 from behemphi/patch-1
...
Update dockerizing.md
Upstream-commit: 874698cb4aaf10d7c1efe91bc15982e4d8c30c20
Component: engine
2014-06-19 07:06:02 -05:00
fd6ce6d68b
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)
Upstream-commit: 40966fa0966b3acd1893852a5297526374b690f2
Component: engine
2014-06-19 13:00:45 +02:00
11e34c9ae0
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)
Upstream-commit: a57298791c882a2a065989b3386b5b14084e8639
Component: engine
2014-06-19 20:33:17 +10:00
8e5f8dab9b
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)
Upstream-commit: 7303467c771cc98f0efcdf8cbb2e0538ad496b72
Component: engine
2014-06-19 20:33:17 +10:00
5d3e706c66
Update dockerlinks.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: 7b1f34d6269b7076dda86e0288b906f553f19bd1
Component: engine
2014-06-19 18:45:31 +09:00
84bd7e4c9e
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)
Upstream-commit: cf331cdd6ad35c6e0d291df51b49aef5909671f5
Component: engine
2014-06-19 03:34:04 -04:00
228f6d739b
Merge pull request #6519 from fredlf/latest-copyedits
...
Copy edits to dockerhub.md, fixed a broken link.
Upstream-commit: b1c114c3a779ab1d2655169b83f5a165483602bc
Component: engine
2014-06-19 01:45:20 -05:00
3da48c6ff1
Merge pull request #6427 from tianon/fix-zsh-completion-mode
...
Fix mode on contrib/completion/zsh/_docker (-x)
Upstream-commit: b13cdb01bdc471e442acba6d86595807824ce67f
Component: engine
2014-06-18 23:01:07 -06:00
5768bbc295
Fix mode on contrib/completion/zsh/_docker (-x)
...
ZSH completion scripts aren't supposed to be executable - they're sourced by ZSH and aren't run directly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f619243099a384a499fb92ed1065cb4cb87ce3ea
Component: engine
2014-06-18 22:59:20 -06:00
f26f8ec5a7
Update dockerizing.md
...
Upstream-commit: a84115206928efd8e506641d2f8f31d136a05041
Component: engine
2014-06-18 22:50:56 -05:00
67efe6867d
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
Upstream-commit: 30313cacce8d1b5c2e373fb2c08b539bfd25007f
Component: engine
2014-06-18 18:03:29 -07:00
e5b30f5226
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 8646bf4a403aa5333d00d0cea27e2dabe242146f
Component: engine
2014-06-18 17:50:24 -07:00
6aadc112a6
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
Upstream-commit: 421707f638211807985d37d9baa5d941304a7487
Component: engine
2014-06-18 20:06:29 -04:00
350844d68d
Merge pull request #6424 from tianon/fix-minor-md2man-bug
...
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
Upstream-commit: a790d3309cc37760bce4f580b79ce4d802ce7745
Component: engine
2014-06-19 09:57:23 +10:00
74082ef48f
Merge pull request #6517 from ostezer/docs-styles-update
...
Docs styles update
Upstream-commit: df217f537706ba89f17c40b54a8ddf40f41d4462
Component: engine
2014-06-18 16:53:46 -07:00
