Gaetan de Villele
d6e6e95820
add gitignore file
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: acf4eab87b
Component: cli
2017-04-21 11:49:00 -05:00
Daniel Nephin
f1f010b701
Enable a unit test on windows.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9484c3bd81fa8aab46b7268c5c3bfeb8e14aa369
Component: engine
2017-04-21 12:31:16 -04:00
Tibor Vass
6d41c81006
Merge pull request #32761 from lukemarsden/clarify-moby-docker
...
Clarify relationship between Moby and Docker.
Upstream-commit: 0e9148b1e92dc6cf79dc57c71423297d5c11d0ca
Component: engine
2017-04-21 07:58:57 -05:00
Luke Marsden
ac7cbfcff6
Clarify relationship between Moby and Docker.
...
Signed-off-by: Luke Marsden <me@lukemarsden.net >
Upstream-commit: 8fff9bd0816f3f86c2f84c26c5b102f3de3cca81
Component: engine
2017-04-21 06:20:46 -05:00
Vincent Demeester
178e6f9ebd
Merge pull request #32632 from ColinHebert/compose_add_labels_during_build
...
Add support for labels during build with compose
Upstream-commit: bb5dfdb8c5acd48f17498b111db360820a50baec
Component: engine
2017-04-21 10:16:48 +02:00
Alvin Deng
a4980cfd50
Update dockerd.md
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: 427a521b025afaa967c701e234f5366cc633cf77
Component: engine
2017-04-20 21:56:21 -05:00
Solomon Hykes
14f3956c8e
Merge pull request #32691 from moby/moby
...
Updated README: a new upstream project to break up Docker into independent components
Upstream-commit: 7f927516eae370aff1e7993ff43e4d99c409e126
Component: engine
2017-04-20 17:32:32 -05:00
Solomon Hykes
c2513f1e56
project: setting a new scope starting the Moby Project
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 252f7246a740b7a1d502638b4026ec81f359e0e1
Component: engine
2017-04-20 17:25:19 -05:00
Solomon Hykes
63ddf44cbf
Add Moby Project logo
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: d8413b86c09f643d970206ccd16fee35900da7bd
Component: engine
2017-04-20 17:03:21 -05:00
Vincent Demeester
9019dbd01c
Merge pull request #32668 from darrenstahlmsft/CleanupEmpty
...
Windows: Do not clean empty windowsfilter folder
Upstream-commit: b8e9250b59de8619b94f7532c0fc182913028f1e
Component: engine
2017-04-20 14:55:45 +02:00
Dave Henderson
ac65b0c3b9
Output docker swarm join on a single line
...
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.
Fixes #32725
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
Upstream-commit: 50368e7a0ebc654689e3932dea588612e3496823
Component: engine
2017-04-20 07:18:25 -05:00
Jim Minter
740b35daa9
Prevent ContainerLogs from hanging if container doesn't run for long
...
Signed-off-by: Jim Minter <jminter@redhat.com >
Upstream-commit: 4fdb17c77765fb44ae263d5012bb79bb8bd15456
Component: engine
2017-04-20 12:27:51 +01:00
Jim Minter
4c4873bc87
Close logger only after StartLogger call
...
Signed-off-by: Jim Minter <jminter@redhat.com >
Upstream-commit: 68e71aa3e686b05987f139a7f64df304461b504a
Component: engine
2017-04-20 12:27:50 +01:00
Jim Minter
3df8030542
Fix race on ContainerAttachRaw
...
Signed-off-by: Jim Minter <jminter@redhat.com >
Upstream-commit: 32ca1214fa55f55c54a54061ecf752b75f2c72c3
Component: engine
2017-04-20 12:27:50 +01:00
Sebastiaan van Stijn
db947691c9
Merge pull request #32713 from vdemeester/integration-cli-move-fakegit
...
[integration] Move fakegit to its own package in cli
Upstream-commit: 7936a962dc5f0f97fa2195c9497bc6e21e13fc2e
Component: engine
2017-04-19 20:30:47 -05:00
Alvin Deng
3ba3666c3a
Add examples of storage-opts and log-opts for the daemon
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: c79bf50ba6cd68267f3d87f40dcd25167b750ea4
Component: engine
2017-04-19 16:35:47 -05:00
Vincent Demeester
f5ac07a8d7
[integration] Move fakegit to its own package in cli
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a582d9dc42abd96bd88197939e082a1ea3c938a7
Component: engine
2017-04-19 15:52:03 +02:00
Vincent Demeester
987b06e286
Use cli for trusted relate command
...
This also removed some skipped test (that are skipped for a long while).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0ba39d4312ff20b11fc777092cc0c3e5ddeb19f
Component: engine
2017-04-19 14:04:39 +02:00
Daniel Nephin
c0890fae22
Add a Dockerfile for building and testing.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: b6cba06801
Component: cli
2017-04-18 19:12:24 -04:00
Daniel Nephin
dd0b499677
Update vendor.conf
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 31c8672805
Component: cli
2017-04-18 18:35:14 -04:00
Jean-Pierre Huynh
e3d2b9b314
MAINTAINER deprecation follow up. Relates to #25466
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 2c435ab8beba93509b957e4ac5e5801b86b5e8f1
Component: engine
2017-04-18 16:44:33 -05:00
Victor Vieux
3492680b4d
Merge pull request #32692 from tiborvass/add-readme-header
...
Add note about the transition to Moby in the README
Upstream-commit: 4bcb02b785bc84ae9f163d936e1f9734ab59c865
Component: engine
2017-04-18 10:06:24 -05:00
Tibor Vass
b20f1e21b6
Add note about the transition to Moby in the README
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fe3797d9865c808b1d47469d3b4ace03ea4ae206
Component: engine
2017-04-18 10:04:08 -05:00
Harald Albers
d2b501cbdb
Remove bogus statement from bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ee785b1b9864e1f77ff04c684949a7f09f1d4934
Component: engine
2017-04-18 10:50:02 +02:00
Boaz Shuster
b70b785207
Use a test table in the daemon delete unit tests
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 8f51746997e4ea26fdc80703d3e9c881b87816f2
Component: engine
2017-04-18 10:30:40 +03:00
Vincent Demeester
70222af7e7
Merge pull request #32647 from vdemeester/integration-runSleepingContainer-using-cli
...
[integration] make runSleepingContainer use cli package
Upstream-commit: 3482b45e60eee8086d0c1bcee8b7298dc90bb6d6
Component: engine
2017-04-18 08:35:55 +02:00
Tõnis Tiigi
7a295107af
Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8
...
Vendor swarmkit 61a92e8
Upstream-commit: cd4c089b9e026317ea85e816b1323cf6465b662b
Component: engine
2017-04-17 23:24:43 -05:00
Tõnis Tiigi
25a20bf925
Merge pull request #32669 from darrenstahlmsft/FixTmpDelete
...
Fix tmp deletion
Upstream-commit: 64932563c91eccec589c02c788a179799fbe5ac6
Component: engine
2017-04-17 23:13:54 -05:00
Daniel Nephin
01b8c0f13a
Add vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6686ada6a4
Component: cli
2017-04-17 18:12:58 -04:00
Daniel Nephin
82309a74cd
Update imports.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 10641c2aae
Component: cli
2017-04-17 18:07:56 -04:00
Daniel Nephin
f68763d049
Add project files
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f2559aa2e0
Component: cli
2017-04-17 17:49:33 -04:00
Daniel Nephin
0890ccc8cb
Import docker/docker/cmd/docker
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: cdd7bc516b
Component: cli
2017-04-17 17:44:40 -04:00
Daniel Nephin
27d281716f
Import docker/docker/client
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: e8a454d8a6
Component: cli
2017-04-17 17:41:20 -04:00
Daniel Nephin
b2d0c4c107
Import docker/docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 1630fc40f8
Component: cli
2017-04-17 17:40:59 -04:00
Daniel Nephin
87e2086595
init
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 1302228707
Component: cli
2017-04-17 17:40:37 -04:00
Darren Stahl
347c2cd583
Windows: Do not attempt to clean empty windowsfilter folder
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5e4e357f6e53ed9aeb0d4988d8c780acd5da3ed5
Component: engine
2017-04-17 13:10:15 -07:00
Darren Stahl
1053121285
Fix tmp folder deletion
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5cea9a0aa557401447d440ce2286be19f8fe3cc2
Component: engine
2017-04-17 13:09:40 -07:00
Daniel Nephin
f6580aefb9
Set Composefile WorkingDir to dirname of the composefile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cad32e0111cec6088cf26cbb122e816fc0a3f6c8
Component: engine
2017-04-17 15:14:58 -04:00
Daniel Nephin
59735a2883
Merge pull request #32666 from vdemeester/fix-test-unit
...
Fix formatter unit test (moving to testify)
Upstream-commit: f33f2578881af36dc403a2063a00b19a4844fcbe
Component: engine
2017-04-17 15:14:08 -04:00
Vincent Demeester
545fff51d9
Fix formatter unit test (moving to testify)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e5b7b7e87b
Component: cli
2017-04-17 17:32:52 +02:00
Vincent Demeester
1720321911
Fix formatter unit test (moving to testify)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3f676c1918226966db0bd776284f12fe71a2b957
Component: engine
2017-04-17 17:32:52 +02:00
Daniel Nephin
d44cde780d
Merge pull request #32614 from aaronlehmann/testify
...
Remove pkg/testutil/assert in favor of testify
Upstream-commit: 1eec7b5583662d82c39510e54e050b21ebf11a18
Component: engine
2017-04-17 11:07:08 -04:00
Daniel Nephin
337700e350
Merge pull request #32614 from aaronlehmann/testify
...
Remove pkg/testutil/assert in favor of testify
Upstream-commit: 31639e04ce
Component: cli
2017-04-17 11:07:08 -04:00
allencloud
1c74a5638b
add empty string for restart policy in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1c7b03a45563ae7e8000465feb04f7c299bb0d6d
Component: engine
2017-04-17 14:37:37 +08:00
Vincent Demeester
95052e2e30
Merge pull request #32645 from thaJeztah/minor-fixes-for-history-format
...
Minor fixups for history CLI reference
Upstream-commit: a9ff628a3c7c55cf016af88f37c4fb6a6029e17a
Component: engine
2017-04-16 23:59:49 +02:00
Vincent Demeester
b1bedaaeee
[integration] make runSleepingContainer use cli package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a899aa6796cd671d0e49e7f11edeb0553f11b356
Component: engine
2017-04-16 23:39:30 +02:00
Vincent Demeester
b16379f608
Merge pull request #32646 from thaJeztah/fix-markdown-indentation-level
...
Fix markdown indentation level
Upstream-commit: 4850bc4df86cbd5afb8c1c15a16834c605dd7756
Component: engine
2017-04-16 22:01:29 +02:00
Aaron Lehmann
10ab51232c
integration-cli: Have TestSwarmJoinPromoteLocked wait for the role to change in the certificate
...
Since the certificate may be renewed multiple times, this check is
necessary.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2b5ef9bfef0eed60356e2af3230b3b5bd782db2b
Component: engine
2017-04-16 12:42:21 -07:00
Sebastiaan van Stijn
b07c419b5f
Fix markdown indentation level
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bda69e61427796b9631d61d61daf692177e95d06
Component: engine
2017-04-16 12:56:00 -05:00
Sebastiaan van Stijn
59a197605b
Minor fixups for history CLI reference
...
This does some minor fix-ups in the CLI reference
for "history", and copies the formattting section to
the man-pages.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2e63c759a264cac09a37ff7f154014038289ca98
Component: engine
2017-04-16 12:51:29 -05:00