toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,590 Commits 3 Branches 295 Tags
692373dbbd3cc86eb122e1cae18a9158b3cc26a3
Commit Graph
34590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn 692373dbbd Merge pull request #35898 from javabrett/docs-contributing-test 
test.md improvements and corrections
Upstream-commit: 9f68f20faecfc084343dc1a6cbd7de1db616e7e0
Component: engine
 2018-02-21 09:32:15 +01:00
Anusha Ragunathan d7eb6e8c90 Merge pull request #36361 from kolyshkin/pr36326-followup 
integration/TestUpdateMemory: fix false failure
Upstream-commit: e3831a62a3052472d7252049bc59835d5d7dc8bd
Component: engine
 2018-02-20 16:10:59 -08:00
Kir Kolyshkin 088ad71eb5 integration/testUpdateCPUQuota: fix name 
The function name should be TestUpdateCPUQuota and not TestUpdateCPUQUota.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 31825081d4c5e643a150b515547cb2a2ea223de4
Component: engine
 2018-02-20 13:36:27 -08:00
Kir Kolyshkin 133cf88cac integration/TestUpdateMemory: fix false failure 
This fixes the following test failure:

> --- FAIL: TestUpdateMemory (0.53s)
>  	assertions.go:226:
>	Error Trace:	update_linux_test.go:52
>	Error:      	Not equal:
>	            	expected: int(524288000)
>	            	received: int64(524288000)

Fixes: 0f9da07b569f0d9
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: cc866470981a1e6a839004f24eb30bb708078068
Component: engine
 2018-02-20 13:31:03 -08:00
Sebastiaan van Stijn dbebd52548 Merge pull request #36326 from kolyshkin/integration-exec 
Add/use container.Exec() to integration
Upstream-commit: ee9abc212032353e19e5b0f5e6410ad67a0cc9b1
Component: engine
 2018-02-20 17:16:09 +01:00
Sebastiaan van Stijn 6899375641 Merge pull request #33922 from ishidawataru/sctp 
Support SCTP port mapping (bump up API to v1.37)
Upstream-commit: 079ed017b61eb819b8184b90013ce89465d3aaba
Component: engine
 2018-02-20 17:00:13 +01:00
Sebastiaan van Stijn ded970f96e Merge pull request #36107 from cpuguy83/cleanup_daemon_root_mount 
Ensure daemon root is unmounted on shutdown
Upstream-commit: eb033c11753872c6269304d8127dbfe7315e476f
Component: engine
 2018-02-20 10:04:41 +01:00
Vincent Demeester 0c0ee07b87 Merge pull request #36330 from vdemeester/migrate-container-list-tests 
test: clean/migrate some docker ps cli-only integration tests 
Upstream-commit: 7060a40addd71605862b668c1ec2b889e3540233
Component: engine
 2018-02-20 08:44:17 +01:00
Akihiro Suda ed5d3f9cce Support SCTP port mapping (bump up API to v1.37) 
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8e435b8279f2af3e0cebd73fa9e25ca1bb26004e
Component: engine
 2018-02-20 11:15:36 +09:00
Brett Randall df67d5ea13 Removed root@... PS1 from in-container root prompts, retaining #. 
Signed-off-by: Brett Randall <javabrett@gmail.com>
Upstream-commit: bef0cd70a62eff156d99ddd15933b658a1af8893
Component: engine
 2018-02-20 11:29:02 +11:00
Brett Randall f4580247c7 test.md improvements and corrections: 
- Mentioned integration-cli test-suite deprecation.
- Removed mentions of removed in-container hack/make.sh
  target test-unit, replaced with hack/test/unit.

Signed-off-by: Brett Randall <javabrett@gmail.com>
Upstream-commit: acaa53bc35ab8fa97d75e90da393d39204a86a15
Component: engine
 2018-02-20 11:21:03 +11:00
Kir Kolyshkin 57f5f76274 integration/TestUpdateMemory: simplify 
1. Use integration/internal/exec, removing the getContainerSysFSValue().

2. Avoid repeating magic numbers, use a variable for those.

3. Fix order of arguments to assert.Equal (first "expected", then "actual").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 0f9da07b569f0d9cbe574db3af3951b4d5c968c0
Component: engine
 2018-02-19 11:25:27 -08:00
Kir Kolyshkin 0582099de6 integration/TestUpdateCPUQUota: use exec 
An implementation of exec in TestUpdateCPUQUota had a few issues,
including resource leaking and calling both ContainerExecAttach and
ContainerExecRun. The last one makes the test flaky:

	update_linux_test.go:136: expected cgroup value 20000, got: Error: Exec
	command f923baf709525f6b38f6511126addc5d9bb88fb477eeca1c22440551090fa2bb
	is already running

Fix by using the integration/internal/exec package.

While at it, use require/assert to further improve code readability.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 8a7d6143fca69623e2f5d409328c97603843ccb6
Component: engine
 2018-02-19 11:25:27 -08:00
Kir Kolyshkin b08746e15a integration: add container.Exec() 
Some test cases might need an ability to execute a command inside a
container (in order to analyse its output and/or exit code). It is a bit
complicated operation to do so using engine API. The function provided
aims to hide this complexity, making exec almost as simple as 'docker
exec'.

NOTE that the exec is synchronous, and command's stdin is closed.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 01143afe54f1be7308c5663a0cc110740626c62b
Component: engine
 2018-02-19 11:25:11 -08:00
Tõnis Tiigi 39cad2aa10 Merge pull request #36256 from wcwxyz/fix-refcounter-memory-leak 
graphdriver: Fix RefCounter memory leak
Upstream-commit: 733ed2ddd3c621dadafbb74feb7b80d20fd3fd6f
Component: engine
 2018-02-19 10:32:14 -08:00
Vincent Demeester 36a89bcfdd Merge pull request #36329 from tonistiigi/tar-cache-fix 
builder: fix wrong cache hits building from tars
Upstream-commit: 8cf42d3ad805467be407962f902156a3834062ff
Component: engine
 2018-02-19 12:01:20 +01:00
Vincent Demeester c2407fa324 Clean some cli-only integration tests 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 641c73d211d7efe15255ae36ab2362cef3584260
Component: engine
 2018-02-19 11:19:19 +01:00
Vincent Demeester e46642afe1 Merge pull request #35510 from ripcurld0/fix_35500 
Display a warn message when there is binding ports and net mode is host
Upstream-commit: 35d69f10a9ac7479095f39358abb78ee6d3ab65f
Component: engine
 2018-02-19 08:57:36 +01:00
Boaz Shuster da22cbc58d Display a warn message when there is binding ports and net mode is host 
When a container is created if "--network" is set to "host" all the
ports in the container are bound to the host.
Thus, adding "-p" or "--publish" to the command-line is meaningless.

Unlike "docker run" and "docker create", "docker service create" sends
an error message when network mode is host and port bindings are given

This patch however suggests to send a warning message to the client when
such a case occurs.

The warning message is added to "warnings" which are returned from
"verifyPlatformContainerSettings".

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 6e78fdb790d2e1dbf95a1733cab9395b1b936622
Component: engine
 2018-02-18 13:28:44 +00:00
Akihiro Suda de6daa450d Merge pull request #36339 from thaJeztah/bump-continuity 
Update containerd/continuity to fix ARM 32-bit builds
Upstream-commit: c5e7537d2305c1855f95422f08ca844d05a17aa2
Component: engine
 2018-02-17 15:18:08 +09:00
Sebastiaan van Stijn 75d038d03f Update containerd/continuity to fix ARM 32-bit builds 
This updates the containerd/continuity package to d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
which fixes builds failing on ARM 32-bit, after this dependency was added in
b3aab5e31faf04d8a29f17be55562e4d0c0cb364

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0947a541866ca05b030afe07dd659887a655e3e
Component: engine
 2018-02-17 00:42:10 +01:00
Tibor Vass dcede7a976 Merge pull request #36303 from dnephin/cleanup-in-daemon-unix 
Cleanup unnecessary and duplicate functions in `daemon_unix.go`
Upstream-commit: 747c163a65365933c5d6d7f0740f2ac8e3775287
Component: engine
 2018-02-16 14:55:18 -08:00
Tõnis Tiigi fbcb172e80 Merge pull request #36144 from emil2k/node-id-required 
Produce errors when empty ids are passed into inspect calls. 
Upstream-commit: db360995df97f9d9bcb4eb6a34a5c35a2711795b
Component: engine
 2018-02-16 10:18:47 -08:00
Vincent Demeester 8a28d41c4f Merge pull request #36335 from thaJeztah/sync-libnetwork-commits 
Sync binary commits with vndr
Upstream-commit: 302e584b78db16ea39aca7d7c1612370c50d20f5
Component: engine
 2018-02-16 16:12:53 +01:00
Sebastiaan van Stijn 0a0d1f70a0 Update tomlv for MIT License 
The BurntSushi/toml code is now re-licensed as MIT. While
the vendored package was already updated, the tomlv binary
used was still using the old license type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 508d5a0bc00400fb41395223cb4c8be3d9b74ade
Component: engine
 2018-02-16 13:42:27 +01:00
Sebastiaan van Stijn 3806697c36 Sync version of userland-proxy with libnetwork vendor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dcf9e7ee1a6f1b840e05e88aeb1aaf2415af38ad
Component: engine
 2018-02-16 13:41:13 +01:00
Sebastiaan van Stijn d4bbb49d5c Add notes about keeping versions in sync 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 02ca7dc6e91931d6d418cbfa006c0bcf67861ae5
Component: engine
 2018-02-16 13:38:45 +01:00
Vincent Demeester b38d6149be Merge pull request #36306 from cpuguy83/fix_logopt_validator_plugins 
Move log validator logic after plugins are loaded
Upstream-commit: 04d97267b6b57987030862c0d355c9a49eb0e445
Component: engine
 2018-02-16 11:52:23 +01:00
Vincent Demeester ff398aa5c7 Merge pull request #34900 from dnephin/send-codecov-report 
Create and send codecov report
Upstream-commit: 01bfb6d27c6a4b12c777a11c58830a5ef83379a9
Component: engine
 2018-02-16 11:36:51 +01:00
Tonis Tiigi bc08869249 builder: fix wrong cache hits building from tars 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f6c8266afddcf24a2eb629af3b8e924e9c78ce73
Component: engine
 2018-02-15 23:42:42 -08:00
Brian Goff 694d72e031 Merge pull request #36323 from iporsut/remove-getOffsetToReader 
Remove unused method from multireader package
Upstream-commit: 89ce4209bd1fed97e30843f7ce1d4b9866ad2ca6
Component: engine
 2018-02-15 21:12:41 -05:00
Brian Goff 963b00a076 Ensure daemon root is unmounted on shutdown 
This is only for the case when dockerd has had to re-mount the daemon
root as shared.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 487c6c7e73dbb7871e80d75f176dd2a3539a2947
Component: engine
 2018-02-15 15:58:20 -05:00
Daniel Nephin cc3e819977 Merge pull request #36304 from Microsoft/jjh/dontrestoreimageformissinglayer 
Don't restore image if layer does not exist
Upstream-commit: b1a1234c60cf87048814aa37da523b03a7b0d344
Component: engine
 2018-02-15 14:48:36 -05:00
Vincent Demeester a4ed28f439 Merge pull request #36274 from thaJeztah/bump-swarmkit 
Bump SwarmKit to f74983e7c015a38a81c8642803a78b8322cf7eac
Upstream-commit: 1474ec1ecf56a2ec711e42f008cbea4e8287503d
Component: engine
 2018-02-15 18:40:09 +01:00
Brian Goff b4446f4926 Move log validator logic after plugins are loaded 
This ensures that all log plugins are registered when the log validator
is run.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b0b9a25e7e60abbe143e149ccaaf4dfb62044016
Component: engine
 2018-02-15 11:53:11 -05:00
Brian Goff 25714179da Merge pull request #36322 from thaJeztah/fix-build 
Fix import path
Upstream-commit: 7d8fa84e11154bf31644b41c50daaac79f463ad5
Component: engine
 2018-02-15 11:52:38 -05:00
Weerasak Chongnguluam 78ec305ac2 Remove unused method from multireader package 
Signed-off-by: Weerasak Chongnguluam <singpor@gmail.com>
Upstream-commit: 6e5fba98a53a832dc1654d87637df14c5b9ab2f1
Component: engine
 2018-02-15 23:10:56 +07:00
Vincent Demeester e8ddf74a02 Test invalid filter and move validation on top 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 05e7f2cf58bdd6c1aaf3da9a92ebcd54cdde6d09
Component: engine
 2018-02-15 16:24:26 +01:00
Sebastiaan van Stijn 664a0689f9 Fix import path 
The utils package was moved to "internal" in commit
af306d149e76b100e08972cda364647bd7bcfe1e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce35439015e4d2190bd82a3b6dfec98f7a12ac90
Component: engine
 2018-02-15 15:29:45 +01:00
Sebastiaan van Stijn 2b13e6eda3 Merge pull request #36318 from yongtang/02152018-docker-py 
Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
Upstream-commit: 1690103906f3e0554a0a9f7ebaadd86363b212f7
Component: engine
 2018-02-15 15:15:23 +01:00
Sebastiaan van Stijn 66a715574f Merge pull request #36055 from cpuguy83/slave_mounts_for_root 
Use rslave propagation for mounts from daemon root
Upstream-commit: ea34f827112b3837e5349827f6309a37217854cb
Component: engine
 2018-02-15 12:57:25 +01:00
Yong Tang 7fad1f8a1a Merge pull request #36320 from yongtang/02142018-diff-tests 
Migrate container diff tests in integration-cli to api tests.
Upstream-commit: 6f8af32f224c986367bc341df8d4abc1a7b6e018
Component: engine
 2018-02-15 03:53:21 -08:00
Yong Tang 90c87d3cd7 Migrate container diff tests in integration-cli to api tests. 
This fix migreates container diff tests in integration-cli
to api tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9537498cedc4e28ee0c8c26ba3d9e59ebb59fcad
Component: engine
 2018-02-15 01:03:29 -08:00
Yong Tang 1903b720b8 Remove docker_cli_diff_test.go from integration-cli 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f19bea20c91e1cd5a748aa241e7083e8c6246634
Component: engine
 2018-02-15 01:03:29 -08:00
Sebastiaan van Stijn bb78e86790 Merge pull request #36298 from arm64b/fix-internal-network-mode 
Fix `DockerNetworkInternalMode` issue
Upstream-commit: e3102d5055995a43b090dbc29342a1846a39edae
Component: engine
 2018-02-15 09:49:15 +01:00
Vincent Demeester f91bc41f1e Merge pull request #36308 from thaJeztah/bump-containerd-1.0.2 
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
Upstream-commit: 41bed9e6d55c39abac701db7a8492026886a95d5
Component: engine
 2018-02-15 09:12:55 +01:00
Vincent Demeester 28ab1221fd Merge pull request #36315 from dnephin/move-commit-to-container-api 
Move commit to container backend
Upstream-commit: d6ac79be3454a3ba34672290218ea5a53b1201a2
Component: engine
 2018-02-15 09:10:52 +01:00
Yong Tang d80026fd7e Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916 
This fix updates docker-py:
```
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
```

The updated docker-py includes https://github.com/docker/docker-py/pull/1909
which is required to have #36292 pass the tests.

Full diff is in https://github.com/docker/docker-py/compare/1d6b5b203222ba5df7dedfcd1ee061a452f99c8a...5e28dcaace5f7b70cbe44c313b7a3b288fa38916.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9d9af83b0fd70ff6a7faa15cf8746669f0f3b588
Component: engine
 2018-02-15 07:43:44 +00:00
Daniel Nephin 0e750709d3 Move commit to container backend 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e574c5ae73f2f54c47319e5e4a17b16bd93213be
Component: engine
 2018-02-14 16:06:12 -05:00
Daniel Nephin a592702237 Remove duplicate rootFSToAPIType 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4ceea53b5e6a86c39122e99f6ffbc1142d28a174
Component: engine
 2018-02-14 11:59:18 -05:00