aa129b356f
hack: TIMEOUT (for controlling test timeout) and forwarding of
...
BUILDFLAGS to binary/dynbinary.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-25 14:25:43 -07: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
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
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
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
d1613e1d59
builder: integration-cli test for the previous commit.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-22 23:18:46 -07:00
1e93639aed
builder: Appropriately initialize the Cmd in runconfig.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-22 23:10:05 -07:00
86a3a9a282
if the Rename during an image delete fails, just delete the original dir
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-22 18:47:20 -07:00
3ea5a20776
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
2014-09-22 19:06:51 -06:00
513f5a358a
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
2014-09-23 10:16:05 +10:00
ab43ad7d5f
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)
2014-09-23 10:09:49 +10:00
f304d4b190
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)
2014-09-23 10:09:49 +10:00
99caa68a46
Merge pull request #7564 from unclejack/integcli-add_utils
...
integration cli: add some utility functions and use them
2014-09-22 17:00:01 -07:00
60f6b0299a
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
2014-09-23 09:57:19 +10:00
636e8561a8
devmapper: resizepool hardcodes files as well
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-22 17:03:31 -04:00
7e9ba22dc3
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>
2014-09-22 16:40:20 -04:00
4778d7d52d
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
2014-09-22 23:00:25 +04:00
e315493b0c
Allow user to change email/passwd via login
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-22 11:58:09 -07:00
06d0853682
Merge pull request #8169 from unclejack/avoid_attach_alloc
...
daemon/attach: avoid mem alloc for interface
2014-09-22 21:29:50 +03:00
950bfe4193
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 21:17:50 +03:00
350b1cf6ea
Merge pull request #5956 from vbatts/vbatts-tarsum_hashes
...
tarsum: allow for generic hashes
2014-09-22 11:11:25 -07:00
c6965e3e45
integcli: add & use dockerCmdWithTimeout & InDir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 21:02:51 +03:00
28e308c25e
Merge pull request #7942 from estesp/7747-stderr-stdout-bug
...
Fix gh#7747: filter bare newline output and log client pull to stdout
2014-09-22 10:53:34 -07:00
5d1cb9d005
integcli: add util to fetch container status
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:34:57 +03:00
97b50e0f29
integcli: consolidate cmd exit code processing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:32:50 +03:00
10ab2089ce
Change content-type for json stream to application/x-json-stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-22 10:29:56 -07:00
ac75835931
Merge pull request #8109 from unclejack/avoid_jsonlog_alloc
...
daemon/logs: avoid JSONLog struct alloc in loop
2014-09-22 12:53:31 -04:00
c8f5c686a5
Merge pull request #8166 from unclejack/integcli_pull_scratch
...
integcli: pull scratch for pull test
2014-09-22 19:16:30 +03:00
77d29847e2
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 19:03:19 +03:00
d2c104c3a0
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 18:57:28 +03:00
473bb5274c
pkg/jsonlog: avoid JSONLog allocation in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 18:57:28 +03:00
9c7d975614
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
2014-09-22 11:16:48 -04:00
Erik Hollensbe
Victor Vieux
Tibor Vass
Doug Davis
Michael Crosby
Dan Walsh
Alexandr Morozov
Tianon Gravi
Sven Dowideit
Sven Dowideit
Ted M. Young
Vincent Batts
Alexandr Morozov
unclejack
unclejack
Jessica Frazelle