p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,754 Commits 2 Branches 295 Tags
3443a67be3a69f07658929cf9d78d6e20154df09
Commit Graph

10754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
3443a67be3 pkg/tarsum: fix panic with dynamic buffer 
When read is called on a tarsum with a two different read sizes, specifically the second call larger than the first, the dynamic buffer does not get reallocated causing a slice read error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5cdf7f507771e159ddd335f3757cd33f7ba4e426
Component: engine
 2014-09-25 15:58:35 -07:00
Tibor Vass
d851131502 Merge pull request #7994 from erikh/parser_fix_volume_parsing 
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
Upstream-commit: d369612b416484301e172bfae3fc692e9c176faf
Component: engine
 2014-09-25 12:45:48 -04:00
Erik Hollensbe
cdd6c2350b builder: Fix handling of VOLUME command where multiple volumes are 
specified in a space delimited list.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
 2014-09-25 09:44:19 -07:00
Sven Dowideit
2dae619626 Merge pull request #8205 from sequenceiq/master 
Fix code example formatting in best-practices article
Upstream-commit: 4547b6d529df10d83ffc1937abc260c8a2ede743
Component: engine
 2014-09-25 12:34:36 +10:00
Sven Dowideit
f81a996837 Merge pull request #8212 from hugoduncan/patch-1 
Fix quoting of TESTFLAGS in devenvironment.md
Upstream-commit: 243134563903c45b48784856b09ee0c377da82d7
Component: engine
 2014-09-25 12:34:12 +10:00
Tibor Vass
fce5f6490a Merge pull request #8195 from tiborvass/migrate-get.docker.io 
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Upstream-commit: 3fa0ed01425dc6facb85a00338ddf99ed74a86be
Component: engine
 2014-09-24 19:06:09 -04:00
Tibor Vass
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
 2014-09-24 18:53:27 -04:00
Victor Vieux
ad7640867a Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test 
Rewrite more fixtures test to not use fixtures.
Upstream-commit: a9368422081a6cbe8b0a77b506bd9684d61c7876
Component: engine
 2014-09-24 15:07:03 -07:00
Andrea Luzzardi
eef9fcd7bb Merge pull request #8200 from aluzzardi/f-ipallocator-check-range 
IPAllocator: Ensure the allocated IPs are within network range.
Upstream-commit: 4479d69d562e707ed9b349290ba137904aa7123f
Component: engine
 2014-09-24 14:29:39 -07:00
Andrea Luzzardi
500b118084 IPAllocator: Ensure the allocated IPs are within network range. 
Since it is possible to request a specific IP, IPAllocator has to verify
that the request is within boundaries.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: a471eb4d9388dc44be0a9c81fa2f15061df636c5
Component: engine
 2014-09-24 11:04:28 -07:00
unclejack
8f469a064b Merge pull request #8173 from crosbymichael/update-mem-limit 
Update memory limit for container
Upstream-commit: f2fad5c2901240cb1b9e3e5747b0334a5b383978
Component: engine
 2014-09-24 20:55:25 +03:00
Hugo Duncan
fb8fce0378 Fix quoting of TESTFLAGS in devenvironment.md 
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
Upstream-commit: 7aa88a4ff66aa0c256dc15e5e5a4ddda34ed0f46
Component: engine
 2014-09-24 13:30:39 -04:00
Victor Vieux
18d0423bae Merge pull request #8182 from LK4D4/logjson_benchmark 
pkg/logjson benchmark and test
Upstream-commit: 75ecfdd63cf4d45c87011e0bc300f2638c3866e2
Component: engine
 2014-09-24 10:00:22 -07:00
Alexandr Morozov
32980488fe Rewrite TestContextTar tests to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d302d9296125d2c7abf4adf992fd6739a19d5fbd
Component: engine
 2014-09-24 17:09:18 +04:00
Alexandr Morozov
ba92a9eabd Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 51a56399f6384decee03a7e1aa56a3f46cb7c63f
Component: engine
 2014-09-24 17:09:14 +04:00
Alexandr Morozov
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
Lajos Papp
65521dc5a1 Fix code example formatting in best-practices article 
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
Upstream-commit: be4454c4f0ba1a1d9fdd2f0ec7e631403ee61f63
Component: engine
 2014-09-24 10:45:56 +02:00
Alexandr Morozov
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
Alexandr Morozov
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
Fred Lifton
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
Fred Lifton
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
Fred Lifton
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
Fred Lifton
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
Victor Vieux
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
Fred Lifton
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
Tibor Vass
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
unclejack
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
Victor Vieux
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
Tibor Vass
0cb047b7d8 Merge pull request #8187 from erikh/builder_onbuild_output 
builder: properly communicate onbuild trigger information during subsequent builds.
Upstream-commit: 27567e55937fded6601d4c6b1fcb82fdfcb4ce04
Component: engine
 2014-09-23 18:04:59 -04:00
Fred Lifton
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
Doug Davis
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
Erik Hollensbe
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
Victor Vieux
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
Tibor Vass
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
Tibor Vass
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
Victor Vieux
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
Michael Crosby
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
Dan Walsh
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
Victor Vieux
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
Tibor Vass
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
Alexandr Morozov
a6c06e4ad8 Test for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2add198a7abc084dd394f61ed26057ec5d639a4c
Component: engine
 2014-09-23 19:19:25 +04:00
Alexandr Morozov
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
Alexandr Morozov
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
Tibor Vass
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
Alexandr Morozov
8dd6b83d46 Benchmark for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 81c9927f8f3c190ed9dd15b62716a240ce20fc51
Component: engine
 2014-09-23 18:24:18 +04:00
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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