4547b6d529
Merge pull request #8205 from sequenceiq/master
...
Fix code example formatting in best-practices article
2014-09-25 12:34:36 +10:00
2431345639
Merge pull request #8212 from hugoduncan/patch-1
...
Fix quoting of TESTFLAGS in devenvironment.md
2014-09-25 12:34:12 +10:00
3fa0ed0142
Merge pull request #8195 from tiborvass/migrate-get.docker.io
...
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
2014-09-24 19:06:09 -04:00
808257654a
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-24 18:53:27 -04:00
a936842208
Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test
...
Rewrite more fixtures test to not use fixtures.
2014-09-24 15:07:03 -07:00
4479d69d56
Merge pull request #8200 from aluzzardi/f-ipallocator-check-range
...
IPAllocator: Ensure the allocated IPs are within network range.
2014-09-24 14:29:39 -07:00
a471eb4d93
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>
2014-09-24 11:04:28 -07:00
f2fad5c290
Merge pull request #8173 from crosbymichael/update-mem-limit
...
Update memory limit for container
2014-09-24 20:55:25 +03:00
7aa88a4ff6
Fix quoting of TESTFLAGS in devenvironment.md
...
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
2014-09-24 13:30:39 -04:00
75ecfdd63c
Merge pull request #8182 from LK4D4/logjson_benchmark
...
pkg/logjson benchmark and test
2014-09-24 10:00:22 -07:00
d302d92961
Rewrite TestContextTar tests to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:18 +04:00
51a56399f6
Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:14 +04:00
52cf331206
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 13:15:55 +04:00
be4454c4f0
Fix code example formatting in best-practices article
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-09-24 10:45:56 +02:00
ab4738b49f
Rewrite TestBuildHistory to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 12:38:48 +04:00
1625cbfc4c
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 12:29:27 +04:00
8dd11c7175
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
2014-09-23 20:55:07 -07:00
f68f5fd521
Merge pull request #8157 from SvenDowideit/sshd-pam-fix
...
Fix for user kicked off after login on some hosts
2014-09-23 20:42:27 -07:00
a1609a7324
Merge pull request #8178 from SvenDowideit/systemd-example-moved
...
That Systemd example URL isn't there anymore
2014-09-23 20:41:13 -07:00
950eccab4a
Revisions and edits based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-09-23 18:26:02 -07:00
827634d355
Merge pull request #7973 from LK4D4/persist_execdriver_dir
...
Persist execdriver dir
2014-09-23 16:01:03 -07:00
6747dfc803
Typo and formatting fixes. Copy edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-09-23 15:51:17 -07:00
b12f3a6cca
Merge pull request #8192 from unclejack/lower_timeout_integ
...
integration: lower timeout for stop/restart tests
2014-09-23 18:46:58 -04:00
6a5f09b752
integration: lower timeout for stop/restart tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-24 01:20:41 +03:00
81a643211b
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
2014-09-23 15:16:57 -07:00
27567e5593
Merge pull request #8187 from erikh/builder_onbuild_output
...
builder: properly communicate onbuild trigger information during subsequent builds.
2014-09-23 18:04:59 -04:00
ab30e19b96
Improve error for docker exec & LXC
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-23 21:47:33 +00:00
d9fd5f6199
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-09-23 14:21:00 -07:00
cd329d062b
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>
2014-09-23 14:16:00 -07:00
8edacc673a
builder: properly communicate onbuild trigger information during
...
subsequent builds.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-23 13:55:51 -07:00
42ec80bec0
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
2014-09-23 11:24:31 -07:00
e3f1f0d354
Merge pull request #8170 from duglin/Issue7547
...
Allow user to change email/passwd via login - Issue 7547
2014-09-23 13:57:56 -04:00
5ce7ee61ef
Merge pull request #8179 from erikh/parser_fix_cmd_null
...
Parser fix cmd null
2014-09-23 13:42:55 -04:00
f2bc723bc6
Merge pull request #8181 from rhatdan/selinux_btrfs
...
--selinux-enabled flag should be ignored on Disabled SELinux systems
2014-09-23 10:31:19 -07:00
437fa0650e
Merge pull request #8165 from duglin/Issue7309
...
If the Rename during an image delete fails, just delete the original dir - Issue #7309
2014-09-23 10:28:48 -07:00
9e2eb0f1cc
--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)
2014-09-23 13:21:25 -04:00
7e461915a6
Merge pull request #8168 from LK4D4/rewrite_fixture_tests
...
Rewrite some tests to not use fixtures
2014-09-23 10:02:59 -07:00
5c110b63dd
Merge pull request #8127 from estesp/8107-fix-wait-error-return
...
Fix container wait error message to match server template for returning ...
2014-09-23 12:03:39 -04:00
2add198a7a
Test for jsonlog.WriteLog
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 19:19:25 +04:00
0c899cefdd
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:32 +04:00
570f1153b9
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:28 +04:00
9941b03af1
Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices
...
devmapper: `docker info` devices hard coded
2014-09-23 10:28:31 -04:00
81c9927f8f
Benchmark for jsonlog.WriteLog
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:24:18 +04:00
c58391bbd0
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
2d802d7f23
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
139b6ed3aa
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
6bb44b6d74
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
5e2ea69606
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
682fbe0134
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
3824ec62e8
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
Sven Dowideit
Tibor Vass
Victor Vieux
Andrea Luzzardi
unclejack
Hugo Duncan
Alexandr Morozov
Lajos Papp
Fred Lifton
unclejack
Victor Vieux
Doug Davis
Erik Hollensbe
Michael Crosby
Dan Walsh