docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
31,836 Commits 12 Branches 295 Tags
d6d79998e2ebfb875662b3a876cc12027601751a
Commit Graph

4565 Commits

Author SHA1 Message Date
Aaron Lehmann
9cc90bfd8d Add integration test for START_FIRST update order 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6763641d6932468a0503516bb32e39202989aa52
Component: engine
 2017-04-06 17:23:36 -07:00
Vincent Demeester
ed86f7c60d Merge pull request #32251 from AkihiroSuda/run-mount 
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
 2017-04-05 22:34:47 +02:00
Brian Goff
3d4ee5930c Merge pull request #32268 from cpuguy83/volume_err_obfuscate 
don't obfuscate error during volume create
Upstream-commit: b7c3b312c92c6a0f897379f583befa6b5ab9c4fe
Component: engine
 2017-04-05 09:05:10 -04:00
Akihiro Suda
6c1668c7bd cli: add --mount to docker run 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
 2017-04-05 04:52:08 +00:00
Tonis Tiigi
077947c0d9 Add a multi stage trusted build testcase 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 79ccb3478f2d1c541d8689a8b5c60ab51d95ca79
Component: engine
 2017-04-04 09:56:00 -07:00
Tonis Tiigi
71418f1299 Add support for FROM using named block 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 672ea30a94933eec228d71217b033da5d6572b8d
Component: engine
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
da4a3b24f4 Implicit copy-from with reference 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 73b4b8ed7f86b8df70d7028c5ac7c2ba61ee0a8c
Component: engine
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
d51100a9ef Add named context support 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 87512bbc8490aca261133a7f3a3ea6518d703c34
Component: engine
 2017-04-04 09:34:28 -07:00
Victor Vieux
ac33a30857 Merge pull request #32015 from dperny/service-logs-support-task-logs 
Add Support for Service Task Logs
Upstream-commit: 170be9c26745b953dbfc5cafdc63eb3895c2c541
Component: engine
 2017-04-04 00:15:13 -07:00
Drew Erny
93e346635c Add support for task and arbitrary combo logs 
Refactored the API to more easily accept new endpoints. Added REST,
client, and CLI endpoints for getting logs from a specific task. All
that is needed after this commit to enable arbitrary service log
selectors is a REST endpoint and handler.

Task logs can be retrieved by putting in a task ID at the CLI instead of
a service ID.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: d330dc3223df7e6c2b066373718709e34e19efca
Component: engine
 2017-04-03 18:40:54 -07:00
Brian Goff
f25b712a8b Merge pull request #32312 from thaJeztah/unit-test-remove-errormessage 
create unit tests for rm (running, paused, restarting) errormessages
Upstream-commit: 53c7995c8bf581f5d5ec17a5eca616f1fbaeb952
Component: engine
 2017-04-03 21:05:30 -04:00
Brian Goff
c96fd9ee7b don't obfuscate error during create 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3b80094665b82bd095cb98528a0cf6ff34a43a58
Component: engine
 2017-04-03 21:04:40 -04:00
Victor Vieux
84fd8f0bc0 Merge pull request #31144 from aaronlehmann/synchronous-service-commands 
Synchronous service create and service update
Upstream-commit: 21ec12b9676f95aaa69c3082b97d0b10031cc90a
Component: engine
 2017-04-03 17:44:03 -07:00
Vincent Demeester
8b68d758b1 Merge pull request #32076 from tmp6154/master 
Bump up nproc in TestExecUlimits
Upstream-commit: 3fb84ca2f51c6f544797d8a84b11180f829f8e15
Component: engine
 2017-04-03 22:30:28 +02:00
Sebastiaan van Stijn
04b3ba3655 create unit tests for rm (running, paused, restarting) errormessages 
These integration tests were basically testing if a
decent error message was printed when attempting
to remove a running, paused, or restarting container.

Moving these tests to a unit-test to make the tests
not flaky (especially on the "restarting" container
test).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2759194d44634b88d7a39134a24a61ca8d60c0ab
Component: engine
 2017-04-03 21:58:05 +02:00
Aaron Lehmann
e84d96f81f Synchronous service create and service update 
Change "service create" and "service update" to wait until the creation
or update finishes, when --detach=false is specified. Show progress bars
for the overall operation and for each individual task (when there are a
small enough number of tasks), unless "-q" / "--quiet" is specified.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 330a0035334871d92207b583c1c36d52a244753f
Component: engine
 2017-04-03 09:46:01 -07:00
Vitaly Ostrosablin
291e5291fe Change TestExecUlimits to use nofile instead of nproc 
Test used to check whether ulimits applied by docker are in effect by
setting up nproc. However, in some environments (e.g. inside Virtuozzo
Containers), number of processes is higher and testcase fails. Hence, we
instead change testcase to check ulimits by setting nofile limit instead
of nproc.

Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
Upstream-commit: d4e132f84da72b5c2f2f63c95a8ca5cddabf8433
Component: engine
 2017-04-03 10:43:43 +03:00
Josh Hawn
8939f52c95 Fix Flakiness in TestRmRestartingContainer 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: e979cf74640213ffe4d883cb00adecb957056e9a
Component: engine
 2017-04-02 17:45:30 -07:00
Vincent Demeester
9230ef4691 Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id 
28722: List of containers with networkID filter is not working
Upstream-commit: 33aae7c5cc3b3689faaef39046cc6d2c6fcda4b6
Component: engine
 2017-04-02 21:06:09 +02:00
dattatrayakumbhar04
b3bf6afbcc 28722: List of containers with networkID filter is not working 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 59b70cdabe3b5f3592e40d241377c6a9f2127dfc
Component: engine
 2017-03-31 08:57:09 +00:00
Vincent Demeester
f66bd50c2b Merge pull request #28696 from jlhawn/deprecate_graph_flag 
Deprecate --graph flag; Replace with --data-root
Upstream-commit: 1ecaed0a99331ff6140e0a714e1b50d466597775
Component: engine
 2017-03-31 10:51:15 +02:00
Vincent Demeester
6ede278af4 Merge pull request #32246 from aboch/vnd 
Vendoring swarmkit @b74ec2b
Upstream-commit: 2a40b35629e23872ff516c2ab24f8f92b915393d
Component: engine
 2017-03-31 10:33:57 +02:00
Alessandro Boch
bff9e0001a Add ingress nw Test around consition which was panicing 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4777fb6c6b1783de01d3dbeacc2d1af33f3fabc2
Component: engine
 2017-03-30 16:12:48 -07:00
Tonis Tiigi
b4a1c08afc builder: Fix setting command with custom shell 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a1fa59ea123555a910c1de1f7b88b75000f2bec4
Component: engine
 2017-03-30 13:29:21 -07:00
Josh Hawn
fd940e1e8e Deprecate --graph flag; Replace with --data-root 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 261ef1fa27c4dfefa5f686b0a4ef354a43040e58
Component: engine
 2017-03-30 11:24:56 +02:00
Lei Jitang
0acd090fda Merge pull request #32197 from FengtuWang/fix_TestDaemonRestartWithInvalidBasesize 
fix TestDaemonRestartWithInvalidBasesize
Upstream-commit: f459e3af9e9f0b5cfb8b05df7ac8b344c5b18266
Component: engine
 2017-03-30 10:15:48 +08:00
Vincent Demeester
782c08e446 Merge pull request #32196 from vdemeester/fix-windowsrs1-integration 
Fix TestAPIDockerAPIVersion on windows
Upstream-commit: 0937dadfdff35a061a6bcd5bf661a4c112f0aafb
Component: engine
 2017-03-29 12:45:31 +02:00
Sebastiaan van Stijn
b3d8de4a6a Merge pull request #32058 from tophj-ibm/flaky-token-test 
Fix flaky test TestPushMisconfiguredTokenServiceResponseError
Upstream-commit: 6263c3cf2ef22919da0966dba1d26178c84113fa
Component: engine
 2017-03-29 12:30:16 +02:00
Fengtu Wang
6e632614a7 fix TestDaemonRestartWithInvalidBasesize 
NotNil is expected behaviour, daemon should not start with
invalid base size.

Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
Upstream-commit: 1d74b4f6d4990901b918d82957bef4bb5f41294c
Component: engine
 2017-03-29 17:32:25 +08:00
Vincent Demeester
cdaff4626f Fix TestAPIDockerAPIVersion on windows 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8c7fdddf480b39b79c688e1d555ca7f18fc5fd70
Component: engine
 2017-03-29 10:28:51 +02:00
Vincent Demeester
f8de9e482c Merge pull request #32175 from vdemeester/fix-30201 
Fix TestTrustedIsolatedCreate – clean trust folder at the end of the test
Upstream-commit: 1f7fd19cec6237f1375531e6c06ebed9e7f9ab67
Component: engine
 2017-03-29 09:15:51 +02:00
Sebastiaan van Stijn
ea10b30ed8 Merge pull request #32142 from vdemeester/integration-cli-package-2 
[test-integration] Migrate some more tests to `cli` package
Upstream-commit: 78e0ad79533d8a9d092071e24dfb41894ad17756
Component: engine
 2017-03-28 21:37:07 +02:00
Vincent Demeester
dc3608e2ad Fix issue #30201 – clean trust folder at the end of the test 
This test doesn't clean the folder where it stores it's config (and
the trust folder), and thus, it fails if we run it more than
once (could also affect other tests at some point).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 16377f4d1667b9234c12be7991de6bd1c472c9a4
Component: engine
 2017-03-28 16:12:41 +02:00
Vincent Demeester
de10a198b8 [test-integration] Migrate some more tests to cli package 
Add some required command operators to the `cli` package, and update
some tests to use this package, in order to remove a few functions
from `docker_utils_test.go`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: eeaa6c96d83575da765dfc626c2c73d8a29dda32
Component: engine
 2017-03-28 15:17:31 +02:00
Sebastiaan van Stijn
b8233dd3d5 Merge pull request #30810 from allencloud/make-secret-ls-support-filter 
make secret ls support filters in CLI
Upstream-commit: 4df350b8c7a53dc82d8a6e187882faf8f90ce766
Component: engine
 2017-03-28 13:43:19 +02:00
Vincent Demeester
3670f999ce Merge pull request #30763 from ripcurld0/fix_30714 
Fix the create API when fromSrc has a bad URL
Upstream-commit: 35e5975b9049f341f947c1bf281b06af45cb1a48
Component: engine
 2017-03-28 10:20:59 +02:00
Madhu Venugopal
51025ebc27 Merge pull request #31714 from aboch/cingr 
Allow user to replace ingress network
Upstream-commit: 04295d26df3034a9a92da8400418f843d7c48780
Component: engine
 2017-03-27 07:30:42 -07:00
allencloud
d840f6fbf0 remove redundant comments in test build.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 32b81dae29fbb6f831cda5e9db1c120f78cd4a91
Component: engine
 2017-03-27 10:59:13 +08:00
allencloud
0bc9fdd1d1 make secret ls support filters in CLI 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 3935074016697b14023371b84b68c62fa1f3344e
Component: engine
 2017-03-27 10:16:45 +08:00
Alessandro Boch
d79afa43f8 Allow user to modify ingress network 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: d59d19c32818ed73cc6b4d153f2858c4fe97f50e
Component: engine
 2017-03-26 15:46:18 -07:00
Boaz Shuster
abc5bcad87 Fix the create API when fromSrc has a bad URL 
When sending a bad URL in the fromSrc parameter using cURL
the response will have status code 200 while it should have 404
or 500 (depends on the error).

This commit addresses this problem in the following ways:
 * Before, `src` was parsed using url.Parse and if the
   returned `url.Scheme` was empty it was set to 'http'
   and `url.Host` was set to `src`.
   This is bad because if `src` was 'web.com/tars/image1.tar'
   The `url.String()` returns 'web.com%2Ftars%2Fimage1.tar`
   which will cause the daemon to fail downloading the file
 * Before writing the "Downloading" message, the image
   is attempted to be downloaded and if there is no error
   the "Downloading" message is sent.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: e050f1760dd8a3d48d95bb3d2de503fc4177ff5f
Component: engine
 2017-03-26 15:21:13 +03:00
Daniel Nephin
c23fd44111 Fix flaky TestStackRemove test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 73e6135458cfa09171526467b41b18890dc8b3d3
Component: engine
 2017-03-24 15:31:08 -04:00
Tonis Tiigi
703c536b96 Fix integration tests build errors 
Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine
 2017-03-24 00:27:32 -07:00
Akihiro Suda
dd50f0df64 Merge pull request #31608 from vdemeester/integration-cli-package 
[test-integration] Introduce a `cli` package for test-integration
Upstream-commit: 8008f6529394d8c458ccf58f4763754681568b57
Component: engine
 2017-03-24 13:04:47 +09:00
Tõnis Tiigi
c90ad1369f Merge pull request #31257 from tonistiigi/nested-build 
build: add multi-stage build support
Upstream-commit: 2fa8fe400d926b3ceb0c84640a8f4e0f36e51463
Component: engine
 2017-03-23 19:14:13 -07:00
Tonis Tiigi
e59b5a1439 Add support for COPY from previous rootfs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f95f58283b2a69f4fd06d01de2281641e09b06bb
Component: engine
 2017-03-23 15:12:15 -07:00
Christopher Jones
1306eb6de7 Fix flaky test DockerRegistryAuthTokenSuite.TestPushMisconfiguredTokenServiceResponseError 
Fixes test by bumping retry count from 4 to 10

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: a96bf0fb2f2803523fd2dff935b8093d0c50f8f1
Component: engine
 2017-03-23 18:10:11 -04:00
Brian Goff
d4d4f16a60 Merge pull request #32019 from anusha-ragunathan/plugin-sigkill 
Add missing test for daemon kill with plugins running.
Upstream-commit: fd56e8ffa14399c8a5d65598de70c4692f222d8f
Component: engine
 2017-03-23 15:46:59 -04:00
Vincent Demeester
9210b1bdbd Introduce a cli package for test-integration 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 50c4475df6304e0cf12ea95217eb00ab5d572e34
Component: engine
 2017-03-23 18:35:22 +01:00
Anusha Ragunathan
d6f71ce6ed Add missing test for daemon kill with plugins running. 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: b748debb76110e577cfde7c5d5c362e69ddf86ce
Component: engine
 2017-03-22 14:38:55 -07:00