0da85d5bbc
Merge pull request #6536 from dgageot/patch-2
...
Fix flag names
Upstream-commit: fa8f89c5212f10932ebc5650853b356670b6f41a
Component: engine
2014-06-23 15:26:08 +10:00
ef84c42974
Merge pull request #6583 from jamtur01/sshd
...
Updated SSH example to ensure it continues working
Upstream-commit: 10b8d6b8b0847bca8630238deddc42237a31309c
Component: engine
2014-06-23 01:17:35 -04:00
6e5314fd43
Remove $ leaders from examples of editing text in a file
...
not everything that is indented is a commandline example
Closes #6591
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4d7e28a7d701c3c3ee331f2d6f4fce62fdd20d93
Component: engine
2014-06-23 14:50:11 +10:00
4f739a98e3
Merge pull request #6581 from fredlf/copyedit_dockerrepo
...
Revised and fixed links on dockerrepo.md
Upstream-commit: ad19e5e1330f6c0155b3cf35313c4c1529f0fb45
Component: engine
2014-06-22 22:17:40 -04:00
115fbc39bb
Merge pull request #6426 from tianon/fix-import-man-error
...
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
Upstream-commit: 875b0698e8d45bf1c6cadbc56b7fd208c303ca5d
Component: engine
2014-06-23 11:48:35 +10:00
e953c57f78
Remove mention of SSH passphrase, it was only present in v0.12
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1e847bff7af8ae722318cc7d448f46be955496c3
Component: engine
2014-06-22 17:36:02 -07:00
4d246d84ff
one last missing redirect
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 51d032737c812347c766bf7a3df43c18ec708b9e
Component: engine
2014-06-22 16:01:21 -07:00
f7a2f6b059
Fixed a typo
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: ab0fc77ebe73e0dededad1d47dc3788191cb966c
Component: engine
2014-06-20 17:52:30 -07:00
03cfca710a
Revised and fixed links on dockerrepo.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c70fbae3ed44090fffc9e5b81d2a6410e6008fcc
Component: engine
2014-06-20 17:10:20 -07:00
914d4d5405
Merge pull request #6578 from ch3pjw/documentation_fix
...
Fix minor typo and improve wording
Upstream-commit: ad19f1beb74cb06c46f4ba424a6a80594f0b6ed6
Component: engine
2014-06-21 09:57:25 +10:00
8a5bd0e9d1
Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
...
Disable netgo for dynbinary builds
Upstream-commit: 506ad22743a233b168fb0053e39e9c5dd1ec92ce
Component: engine
2014-06-20 17:51:12 -06:00
bb5e064589
Merge pull request #6529 from qwazerty/master
...
Fix minor typo
Upstream-commit: d6f7725e58d42763ac228ad65a7c1e285d8e422f
Component: engine
2014-06-20 17:37:07 -04:00
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
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
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
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
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
d81f6470d4
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)
Upstream-commit: 3f7909e9967ded9740fdf951c6f7e95f4aa9c963
Component: engine
2014-06-19 14:35:30 -06: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
f3557341d8
Fix minor typo
...
Docker-DCO-1.1-Signed-off-by: Kevin Houdebert kevin.houdebert@gmail.com (github: qwazerty)
Upstream-commit: d7e5fdfb58d5829344486b7a6171f7e866f0378b
Component: engine
2014-06-19 14:49:52 +02:00
2ee8468f73
Updated SSH example to ensure it continues working
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 10eae16fa70ac04191401bf2872ffa6688f79b82
Component: engine
2014-06-19 07:44:41 -05: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
