beff003be9
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 52cf331206b9e50ba9b52f950b5a377179cf7aa5
Component: engine
2014-09-24 13:15:55 +04:00
a1e93ec56c
Rewrite TestBuildHistory to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: ab4738b49fa72b5ac1d5cc441f6e5bb4328a04c6
Component: engine
2014-09-24 12:38:48 +04:00
49a6b8858b
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 1625cbfc4c02843ff0fbbf43bd46c13698609f2a
Component: engine
2014-09-24 12:29:27 +04:00
134a1a90ab
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
Upstream-commit: 8dd11c7175147d31761b647daac10fb18f0420c2
Component: engine
2014-09-23 20:55:07 -07:00
aeb0f3e4bc
Merge pull request #8157 from SvenDowideit/sshd-pam-fix
...
Fix for user kicked off after login on some hosts
Upstream-commit: f68f5fd521270ad9775fb0adfe7516f9e4855ba5
Component: engine
2014-09-23 20:42:27 -07:00
4e7f3a0260
Merge pull request #8178 from SvenDowideit/systemd-example-moved
...
That Systemd example URL isn't there anymore
Upstream-commit: a1609a7324c934ed4d151d75395173c1054f836b
Component: engine
2014-09-23 20:41:13 -07:00
82616b8c9e
Revisions and edits based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 950eccab4ad4d79a5afa154849567ddfdf8dc7eb
Component: engine
2014-09-23 18:26:02 -07:00
7f18ab2efd
Merge pull request #7973 from LK4D4/persist_execdriver_dir
...
Persist execdriver dir
Upstream-commit: 827634d355bcbda3e75a05598022edf2262a2585
Component: engine
2014-09-23 16:01:03 -07:00
7f93986b70
Typo and formatting fixes. Copy edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6747dfc8031205f0e629a3508f14125b3b66a5b2
Component: engine
2014-09-23 15:51:17 -07:00
b69daeee17
Merge pull request #8192 from unclejack/lower_timeout_integ
...
integration: lower timeout for stop/restart tests
Upstream-commit: b12f3a6cca945f600f5aa35620b23e5aad5d8c6f
Component: engine
2014-09-23 18:46:58 -04:00
fd178d0d6f
integration: lower timeout for stop/restart tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6a5f09b752c32983472bd194fef1828a73c95203
Component: engine
2014-09-24 01:20:41 +03:00
3c0e9292e2
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
Upstream-commit: 81a643211bbd88545d21550defc9cd7e3f8437bd
Component: engine
2014-09-23 15:16:57 -07:00
756d3489d5
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d9fd5f6199aebb9ea784f5b23ec97b960f89f3d4
Component: engine
2014-09-23 14:21:00 -07:00
c65c43b413
Make sure COPY/ADD on dirs doesn't grab too many files
...
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd329d062bddaffcfea3ac0cd3245c0be5bf5542
Component: engine
2014-09-23 14:16:00 -07:00
e73a233371
builder: properly communicate onbuild trigger information during
...
subsequent builds.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 8edacc673a0ecb4320377457f0bf9dbdaa08f843
Component: engine
2014-09-23 13:55:51 -07:00
55f5c84e4a
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
Upstream-commit: 42ec80bec02b7cb921397fc79ca58a18190e2c4b
Component: engine
2014-09-23 11:24:31 -07:00
ce6723b5c8
Merge pull request #8170 from duglin/Issue7547
...
Allow user to change email/passwd via login - Issue 7547
Upstream-commit: e3f1f0d354020dabee37d7ca31c41938339ad540
Component: engine
2014-09-23 13:57:56 -04:00
c9783e2c8a
Merge pull request #8179 from erikh/parser_fix_cmd_null
...
Parser fix cmd null
Upstream-commit: 5ce7ee61efd1926ae601de8bd98544ba25c6d235
Component: engine
2014-09-23 13:42:55 -04:00
617d0d8587
Merge pull request #8181 from rhatdan/selinux_btrfs
...
--selinux-enabled flag should be ignored on Disabled SELinux systems
Upstream-commit: f2bc723bc6d2ec7000b75147f8e71fb04a6c2b0c
Component: engine
2014-09-23 10:31:19 -07:00
02086c81fa
Merge pull request #8165 from duglin/Issue7309
...
If the Rename during an image delete fails, just delete the original dir - Issue #7309
Upstream-commit: 437fa0650e6dcd972f153758429395b63109016f
Component: engine
2014-09-23 10:28:48 -07:00
dec046710f
--selinux-enabled flag should be ignored on Disabled SELinux systems
...
On Fedora and RHEL we ship selinux-enabled flag in the docker.service config,
but if people setup the /var/lib/docker as btrfs and disable SELinux,
we should not block the daemon from running.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 9e2eb0f1cc3c4ef000e139f1d85a20f0e00971e6
Component: engine
2014-09-23 13:21:25 -04:00
56b0530f73
Merge pull request #8168 from LK4D4/rewrite_fixture_tests
...
Rewrite some tests to not use fixtures
Upstream-commit: 7e461915a610174bbbdd20aab30f6ed30c2909b5
Component: engine
2014-09-23 10:02:59 -07:00
1359602f0a
Merge pull request #8127 from estesp/8107-fix-wait-error-return
...
Fix container wait error message to match server template for returning ...
Upstream-commit: 5c110b63dd1bc6300f16a172cd9f4457913491fb
Component: engine
2014-09-23 12:03:39 -04:00
733cfbef1c
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 0c899cefdd2f1826d16bd979651003a9502888e9
Component: engine
2014-09-23 18:58:32 +04:00
02962cb6ce
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 570f1153b9b09fc8b23b86a15fd6f37c2f873a67
Component: engine
2014-09-23 18:58:28 +04:00
a875fd8b49
Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices
...
devmapper: `docker info` devices hard coded
Upstream-commit: 9941b03af1f22bb714c3eee84dffd806e2a66889
Component: engine
2014-09-23 10:28:31 -04:00
82b1f11dad
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c58391bbd03a6dd71096fb2d7541e10fa9123e27
Component: engine
2014-09-23 15:15:58 +04:00
842da56368
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2d802d7f23ad0d9f59abd8144f2bad094e338339
Component: engine
2014-09-23 15:15:58 +04:00
a1258eabee
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 139b6ed3aa81d5d3c6ceaacc5041afca4d39d75a
Component: engine
2014-09-23 15:15:58 +04:00
6826b77d3f
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6bb44b6d7441d1a2b7136063a73c31c946be625f
Component: engine
2014-09-23 15:15:58 +04:00
1fda8e299f
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 5e2ea69606850cf2da1c50ec4bc32c981999aafd
Component: engine
2014-09-23 15:15:58 +04:00
2e55c2075c
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 682fbe0134180488c1a7f2b755b6bb9ae09e9448
Component: engine
2014-09-23 15:15:09 +04:00
08a3014c75
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3824ec62e81d78db4dd36ffd64b17ef4c620b47f
Component: engine
2014-09-23 15:15:09 +04:00
ef9cb160c9
builder: integration-cli test for the previous commit.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: d1613e1d59d0a1e29feafe0537d12675dee24f39
Component: engine
2014-09-22 23:18:46 -07:00
62b6528cbb
builder: Appropriately initialize the Cmd in runconfig.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 1e93639aed80588e70e65a850b7c7843d381d3dd
Component: engine
2014-09-22 23:10:05 -07:00
4116d85932
That URL isn't there anymore
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 46319a5c33c324b26bc4c8ad647632744ef88cbc
Component: engine
2014-09-23 15:04:00 +10:00
f4fc3cbb97
if the Rename during an image delete fails, just delete the original dir
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 86a3a9a2822e5473816d5ced945b37fcc2131e1e
Component: engine
2014-09-22 18:47:20 -07:00
f783617844
Merge pull request #8094 from smerrill/feature/avoid-docker-start-woes
...
Try to avoid issues when the Docker daemon restarts or stops on RHEL/CentOS 6
Upstream-commit: 3ea5a20776ce6024752cc2c5964b08aeb8ce6c7d
Component: engine
2014-09-22 19:06:51 -06:00
84c8b465f8
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
Upstream-commit: 513f5a358adc9de5ecbca04b6d2225be84837580
Component: engine
2014-09-23 10:16:05 +10:00
b44c9bd465
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: ab43ad7d5fa8361736446af323c1fce77f150296
Component: engine
2014-09-23 10:09:49 +10:00
6bc23af935
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com > (github: SvenDowideit)
Upstream-commit: f304d4b190276939c9aff2090925342d16c7405e
Component: engine
2014-09-23 10:09:49 +10:00
02653b3385
Merge pull request #7564 from unclejack/integcli-add_utils
...
integration cli: add some utility functions and use them
Upstream-commit: 99caa68a46817f13a893542321ffc020bfa4cbf9
Component: engine
2014-09-22 17:00:01 -07:00
a396321542
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
Upstream-commit: 60f6b0299a11212f9562d7df0f126d517fd2d3a6
Component: engine
2014-09-23 09:57:19 +10:00
dd5abc97c6
devmapper: resizepool hardcodes files as well
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 636e8561a86ffba909790e9188ffe282770570f0
Component: engine
2014-09-22 17:03:31 -04:00
b69ca50509
devmapper: docker info devices hard coded
...
If `--storage-opt dm.datadev=/dev/loop0 --storage-opt
dm.metadatadev=/dev/loop1 ` were provided, the information was not
reflected in the information output.
Closes : #7137
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7e9ba22dc358196ac0d13524aa05677327f19ff9
Component: engine
2014-09-22 16:40:20 -04:00
5f2492cd77
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
Upstream-commit: 4778d7d52d97666b3c7d886861f30a39ecc1bb24
Component: engine
2014-09-22 23:00:25 +04:00
22e9827649
Allow user to change email/passwd via login
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e315493b0c49978a43dacf7c436839d64a401640
Component: engine
2014-09-22 11:58:09 -07:00
ab2c20ea99
Test on execdriver dir behavior
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 652cd6a842377ec55b53333c7ddc0fc50b587a99
Component: engine
2014-09-22 22:49:21 +04:00
788ec364da
Persistent directory for container in execdriver
...
This is needed for persistent namespaces
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 623ebf203bc4f4e6ddefdd494f201a1401ab72a6
Component: engine
2014-09-22 22:48:26 +04:00
ab7d3fd292
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 950bfe419390bc0e5777ae70bd01f781ae61701a
Component: engine
2014-09-22 21:17:50 +03:00
