7983e51d5c
Use prefix naming for ps tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 00b82fcab6492a853958a3a5f43f95469a60e12f
Component: engine
2014-09-19 22:11:54 +04:00
2a20f56a59
Use prefix naming for port tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6e8c9e7bee5319b1e324c72240ef9d7a77946135
Component: engine
2014-09-19 22:11:54 +04:00
0476801567
Use prefix naming for links tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: b6325907e9de4020381ad1d016614f819da58cc6
Component: engine
2014-09-19 22:11:54 +04:00
d8c88456d9
Use prefix naming for create tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 27a27b73880c4e79d23b65c9032264a4a8fca1cd
Component: engine
2014-09-19 22:11:54 +04:00
6e01160f0a
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 66cd3640f16f5b91893dacd6de3f8c5ae55e2f2c
Component: engine
2014-09-19 22:11:50 +04:00
987f4f8cee
integcli: fix permission detection for aufs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 1a0347ff1dd1035066b5faf86db0587491b5d638
Component: engine
2014-09-19 21:08:57 +03:00
32e1dc80f1
archive: adding comment to exported functions
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0fe56ce1b97736c374d3d649d2df0a19f3b2884f
Component: engine
2014-09-19 14:02:12 -04:00
f32be6203d
Add drone.io configuration
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: ed072ed71dfbd3539d769fc2aa882f6029b7bc64
Component: engine
2014-09-19 11:00:28 -07:00
2941f9c6d5
Use prefix naming for attach tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: f312f784e18f3a0a087e615162c1e38b1bae8e51
Component: engine
2014-09-19 21:56:25 +04:00
1d842ff63a
Use prefix naming for inspect tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3812a6a8466f639cfd538c05c3ff2730a70b1440
Component: engine
2014-09-19 21:56:25 +04:00
0103b6d058
Use prefix naming for events test
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 9720078f9e299f6b7207060599c322a58fc9b8b8
Component: engine
2014-09-19 21:56:25 +04:00
1390b58ea2
Use prefix naming for docker_cli_run_test.go
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: aa536b27a7897373384ab0335c44f44b0bb83455
Component: engine
2014-09-19 21:56:24 +04:00
93e967ece5
Add support for multiple level CLI commands
...
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: e1b968f1981f21470a67ed617c36f1c6802bd0a7
Component: engine
2014-09-19 10:43:50 -07:00
6c408956c3
Fix container wait error message to match server template for returning 404
...
Addresses #8107
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: be6bce6ab8bd0e3a7bd175d3fbe3f6e4fab6b02b
Component: engine
2014-09-19 13:33:00 -04:00
bec783657b
Fix detaching from attached container
...
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md
Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com >
Upstream-commit: 1d2a1598c54d9ca8d3d02ec5e7b0231a8cf153d3
Component: engine
2014-09-19 19:34:05 +03:00
9e6770baa4
FIX 6613:launch docker fail with space named drive
...
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com >
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: acea488eb6ed40e6e5894e1b259ad861c9a98042
Component: engine
2014-09-19 12:07:53 -04:00
cbc12688b3
Merge pull request #8076 from duglin/MultiCopyAdd
...
Add support for copy/add with multiple src files
Upstream-commit: e91de29e0818b40adec155c3353e510d7bcf87b5
Component: engine
2014-09-19 09:01:29 -07:00
84da0ae620
Automatically clean up hello-world container with --rm
...
Signed-off-by: Bruno Binet <bruno.binet@gmail.com >
Upstream-commit: d78936b41842ce725f293f6bba1e3604c91682a3
Component: engine
2014-09-19 12:22:39 +02:00
639ef06c02
Merge pull request #8091 from jfrazelle/exec-main-manpage
...
Add docker-exec to main manpage
Upstream-commit: 39ed048aabbc9e2c2981339ce02169d79c6c4f1c
Component: engine
2014-09-19 16:17:11 +10:00
c01755f5a3
Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit
...
boot2docker shellinit will set any and all env vars needed.
Upstream-commit: 742eb7e0018e192b1ca32a045ec053c22261aecb
Component: engine
2014-09-19 00:46:15 -04:00
55b8ec78cc
Add support for copy/add with multiple src files
...
Part one of solution for issue #6820
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 05b8a1eb363ce03a9dfa3315fbac59c42af2df54
Component: engine
2014-09-18 20:12:13 -07:00
5503a73c31
Merge pull request #7694 from eyakubovich/master
...
Add an option to disable IP masquerading
Upstream-commit: 72e901559177a4a49f82779dbaa108487dce086d
Component: engine
2014-09-18 18:33:45 -07:00
1192584d04
Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5
...
Fix duplicate iptables rules
Upstream-commit: d5537e0f039512c322efa6aec176349eff731499
Component: engine
2014-09-18 17:51:15 -07:00
be7f27050e
Merge pull request #8061 from SvenDowideit/document-image-tarball-format
...
Add a little description of the image tarball format.
Upstream-commit: 82aa895c6dc592809d97284744dbd90c869097c5
Component: engine
2014-09-19 10:32:13 +10:00
c86477a1f5
Merge pull request #8111 from acroca/master
...
Grammar fix
Upstream-commit: 031231b5ed6993f6de88bca636a2b939677a3197
Component: engine
2014-09-18 17:27:24 -07:00
eec790d02f
boot2docker shellinit will set any and all env vars needed.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 77975722492adcd791e1210a12e5f58fa81c29e8
Component: engine
2014-09-19 10:20:12 +10:00
b339cb93d3
'an file' -> 'a file' grammar fix
...
Signed-off-by: Albert Callarisa Roca <albert@acroca.com >
Upstream-commit: 4e11902d05816ba76e15f4af91dd4c507946072e
Component: engine
2014-09-19 08:12:33 +08:00
5770448fc1
test for panic on daemon restart
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 42dafe4bd84842532361a2d704493d124f438ab1
Component: engine
2014-09-18 21:54:42 +00:00
924f51b1d5
Initialize execStore while restoring a container from checkpoint.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 003afaf1ce9f9d2983c84093fb00f4b68a99b0fa
Component: engine
2014-09-18 21:40:53 +00:00
e5b81f13f8
tarsum: allow for alternate block ciphers
...
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4e9925d780665149b8bc940d5ba242ada1973c4e
Component: engine
2014-09-18 10:34:58 -04:00
cfaf0bf98f
Try to avoid issues when the Docker daemon restarts.
...
This change will allow the Docker daemon's init script to wait up to 5
minutes before being forcibly terminated by the initscript. Many
non-trivial containers will take more than the default 3 seconds to
stop, which can result in containers whose rootfs is still mounted and
will not restart when the daemon starts up again, or worse, orphan
processes that are still running.
Signed-off-by: Steven Merrill <steven.merrill@gmail.com >
Upstream-commit: 640d2ef6f54d96ac4fc3f0f745cb1e6a35148607
Component: engine
2014-09-18 08:21:00 -04:00
e4806321a3
Add Build prefix to Copy tests
...
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 184fe67bbc3759307adb6cb3e5338b5325bb88bb
Component: engine
2014-09-18 09:09:10 +04:00
c6ab84449d
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: aa0449c8139afec8e1446bb8650acad886b0a194
Component: engine
2014-09-18 09:02:05 +04:00
2508e0d078
Adding additional documentation for fixed-cidr networking
...
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu > (github: fkautz)
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3bb12d390a8a965e4dc680db7ecdab8c76f23990
Component: engine
2014-09-18 08:48:24 +04:00
d38719a9ac
Add a little description of the image tarball format.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: db9f8ba55cf2293f590ea5d129463ffc9a4eb23d
Component: engine
2014-09-18 10:40:55 +10:00
44cb0660ec
Merge pull request #8081 from abh1nav/master
...
Update remote_api_client_libraries.md
Upstream-commit: e9b5acba4b7a0a21e030b775b82351189367eb41
Component: engine
2014-09-18 10:24:53 +10:00
8f5fad7c3d
Merge pull request #8025 from davidpelaez-forks/docs-fix
...
Improved X-Registry-Auth content instructions
Upstream-commit: c7c78acf815c081ca56616a8b4c145217329f5e3
Component: engine
2014-09-18 09:54:25 +10:00
bafb79990e
Merge pull request #8097 from erikh/builder_maintainers
...
Add a new MAINTAINERS file for the builder.
Upstream-commit: f8be5f586f440b93affdff5ae182dc9e0dc98966
Component: engine
2014-09-17 15:42:34 -07:00
d03dfb81a2
Add a new MAINTAINERS file for the builder.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 1ff1befd12027f9de33f715e241a9818ee9a4a41
Component: engine
2014-09-17 15:36:04 -07:00
a701f25898
Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
...
lower the number of allocations in broadcastwriter
Upstream-commit: 77d30e71122c7ec328f79836dcab4409f72e04b9
Component: engine
2014-09-17 15:26:44 -07:00
18373aa635
Removed runconfig.ParseSubcommand
...
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: 9aa71549d61875fcf0713a9da11b034e70e1c3b0
Component: engine
2014-09-17 14:38:22 -07:00
c978982604
Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
...
tarsum: name collision fix
Upstream-commit: 458b019e62bd41da08b99d49db9b2ee079fee29a
Component: engine
2014-09-17 21:59:39 +03:00
a7e4304ecd
Add docker-exec to main manpage
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: fc75ade4f81229d5f6c36150b1c99c0edb7a8e8f
Component: engine
2014-09-17 11:46:49 -07:00
b0b8a2773b
tarsum: name collision fix
...
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: c5e6362c53cbbc09ddbabd5a7323e04438b57d31
Component: engine
2014-09-17 14:37:46 -04:00
0e86e16728
Merge pull request #8088 from unclejack/integcli-keep_permissions
...
integcli: run inaccessible context test in tmpdir
Upstream-commit: c171cf0cc3ac2a2b0d164fb5ead748e372f73837
Component: engine
2014-09-17 22:06:26 +04:00
699424477b
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: be924087eb5a2ab0ad79c069782e82805dd31d58
Component: engine
2014-09-17 20:05:33 +03:00
509598ebe9
Merge pull request #8084 from unclejack/improve_stdcopy
...
stdwriter: improve perf by avoiding buffer growth
Upstream-commit: 8b97e2c28732c5bf24e1e41bfa2033554e352821
Component: engine
2014-09-17 12:47:00 -04:00
995ea10dab
Benchmark for StdWriter.Write
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 55cac6c9421702ca1e42b3e3f92266e865a5c769
Component: engine
2014-09-17 19:24:07 +04:00
1aa081f9b0
stdcopy: improve perf by avoiding buffer growth
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 277aa9c67415b9b76ab17daea583b51f8560a6a5
Component: engine
2014-09-17 18:06:17 +03:00
ba4bc005be
move stdcopy to pkg/stdcopy
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 1f03e60c2a96a92acae0e4d2fd604ab2c6d55473
Component: engine
2014-09-17 18:06:17 +03:00
