toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,051 Commits 3 Branches 295 Tags
83a77ecc35d5af3c21dcfd888afacff22260efcb
Commit Graph
36051 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu 83a77ecc35 Merge pull request #196 from thaJeztah/18.09_backport_plugin_partial 
[18.09 backport] Adds PartialLogMetadata to encode protobuf for logger plugins
Upstream-commit: 10b63ee8ba1b51d4740f1bbb92be7bfe375d9ed3
Component: engine
 2019-06-18 10:27:44 -07:00
Andrew Hsu 2f921c9ec1 Merge pull request #203 from thaJeztah/18.09_backport_gcr_workaround 
[18.09 backport] builder: add workaround for gcr auth issue
Upstream-commit: 6b2d2eb653e7e634852fad4fbf4ea0df86868109
Component: engine
 2019-06-18 10:20:39 -07:00
Andrew Hsu ab19839d16 Merge pull request #221 from thaJeztah/18.09_backport_swarmnanocpu 
[18.09 backport] Switch swarmmode services to NanoCpu
Upstream-commit: d1a30309de3f9e13d78779976e28ce52dfebdf2f
Component: engine
 2019-06-18 10:09:46 -07:00
Andrew Hsu c211b6a944 Merge pull request #186 from thaJeztah/18.09_backport_bump_cgroups 
[18.09 backport] update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
Upstream-commit: af585fc188292c56d6df8f6cd557ba0e59947054
Component: engine
 2019-06-18 10:02:21 -07:00
Andrew Hsu 1e7ba22582 Merge pull request #190 from thaJeztah/18.09_backport_mirrors_validation 
[18.09 backport] daemon: fix mirrors validation
Upstream-commit: a43a4ab30ec789a31ee3a14118bf02b7cc54cff0
Component: engine
 2019-06-18 10:01:17 -07:00
Andrew Hsu 728c223f90 Merge pull request #273 from thaJeztah/18.09_backport_entropy_cannot_be_saved 
[18.09 backport] Entropy cannot be saved
Upstream-commit: 0ab832439e8ae2810e7a7ab2e2d7860bb6f45789
Component: engine
 2019-06-18 10:00:05 -07:00
Andrew Hsu afc04c47ed Merge pull request #265 from thaJeztah/18.09_backport_do_not_order_uid_gid_mappings 
[18.09 backport] Stop sorting uid and gid ranges in id maps
Upstream-commit: 047143abc38294668b1680c46e8ea0868838beb0
Component: engine
 2019-06-18 09:56:53 -07:00
Andrew Hsu 800f827460 Merge pull request #199 from thaJeztah/18.09_backport_fix_panic_on_empty_dockerfile 
[18.09 backport] fix panic on empty dockerfile
Upstream-commit: 70399c41d321651121a4eb2775c4e7f63796426f
Component: engine
 2019-06-18 09:49:05 -07:00
Andrew Hsu 6cdb81566e Merge pull request #202 from thaJeztah/18.09_backport_update_docker_py 
[18.09 backport] Update docker-py to 3.7.0
Upstream-commit: 5749d5ae7967038eecd974767142d27652bbbc2f
Component: engine
 2019-06-18 09:46:14 -07:00
Andrew Hsu 14405a174e Merge pull request #230 from thaJeztah/18.09_backport_windows_tag 
[18.09 backport] Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests
Upstream-commit: bb54c5bf2a3ab1c698fda6b3d67773d25755ae45
Component: engine
 2019-06-18 09:44:44 -07:00
Andrew Hsu aa8e14244e Merge pull request #236 from thaJeztah/18.09_backport_thanks_brian_now_im_hungry 
[18.09 backport] Fix error handling for bind mount spec parser.
Upstream-commit: 41fbd152739faa225db8c9913e34c663b9202101
Component: engine
 2019-06-18 09:43:19 -07:00
Andrew Hsu 28df654a77 Merge pull request #194 from thaJeztah/18.09_backport_bump_containerd_v1.2.6 
[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8
Upstream-commit: 3bacaaded9e086ec06fc335146eda614e1110570
Component: engine
 2019-06-18 09:41:42 -07:00
Andrew Hsu be6d997b5e Merge pull request #205 from thaJeztah/18.09_backport_remove_stale_lb_ep 
[18.09 backport] Remove a network during task SHUTDOWN instead of REMOVE
Upstream-commit: 605119d7b0c3b3dff7ff41b2da8e50fcaff8bae5
Component: engine
 2019-06-18 09:25:24 -07:00
linuxmercedes a3041ba7dd Test: dockerfiles with no instructions are detected 
Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
(cherry picked from commit 18c7e8b927928654a67ce5d6637e42932fc3e7df)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd084b23f7c3ca38c5d9c15ec16e119d25e5d7af
Component: engine
 2019-06-18 13:44:08 +01:00
linuxmercedes a439056531 Convert parse errors to more informative format 
- Wrap parse errors in errdefs.InvalidParameters
- Include dockerfile in error names

Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
(cherry picked from commit 64466b0cd9ff36dc3f123a3a68eae438ac9e8e60)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7eb0e6a095ac71bfe3e3419cef7d5867fef55f20
Component: engine
 2019-06-18 13:44:04 +01:00
Sebastiaan van Stijn cbbe578ba2 bump buildkit 05766c5c21a1e528eeb1c3522b2f05493fe9ac47 (docker-18.09 branch) 
- moby/buildkit#952 [18.09 backport] Have parser error on dockerfiles without instructions
  - backport of moby/buildkit#771 Have parser error on dockerfiles without instructions

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a1d76e0585c498f5167b28b9909fd8c88fd3370d
Component: engine
 2019-06-18 13:43:59 +01:00
Sebastiaan van Stijn 0addc7f6c5 Update docker-py to 3.7.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c0c05affc79b199248b457af16fff61c305b7623)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b92e9e9da9519efa38d8a5927af668413cf81cd7
Component: engine
 2019-06-18 13:42:20 +01:00
Justin Cormack 932cc247c5 Entropy cannot be saved 
Remove non cryptographic randomness.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 2df693e533e904f432c59279c07b2b8cbeece4f0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 292b43b15b68cd4b64bfc7b89452dc19ddf2cf48
Component: engine
 2019-06-18 13:38:50 +01:00
Arko Dasgupta 8642bba6c4 Network not deleted after stack is removed 
Make sure adapter.removeNetworks executes during task Remove
adapter.removeNetworks was being skipped for cases when
isUnknownContainer(err) was true after adapter.remove was executed

This fix eliminates the nil return case forcing the function
to continue executing unless there is a true error

Fixes https://github.com/moby/moby/issues/39225

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit 70fa7b6a3fd9aaada582ae02c50710f218b54d1a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 75887d37e1ddbef579e239ff0b1b7a2508e486fd
Component: engine
 2019-06-18 13:34:02 +01:00
Arko Dasgupta ac643ab134 Remove a network during task SHUTDOWN instead of REMOVE to 
make sure the LB sandbox is removed when a service is updated
with a --network-rm option

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit 680d0ba4abfb00c8ac959638c72003dba0826b46)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 280b8dff7df137dd21fcf27cacf6d12ed531770a
Component: engine
 2019-06-18 13:33:58 +01:00
Yong Tang e00a39ba2b Move serviceRunningTasksCount to integration/internal/swarm 
This fix moves multiple places of serviceRunningTasksCount
to one location in integration/internal/swarm, so that
code duplication could be removed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit e485a60e2bcc59860f387c94f6afaa0130ea7040)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c087f681d40332bd7d158baf615c03f6a72274f1
Component: engine
 2019-06-18 13:33:14 +01:00
Olli Janatuinen e91395081e integration: Corrected service update tests logic 
Tests which will re-deploy containers uses function serviceIsUpdated() to
make sure that service update really reached state UpdateStateCompleted.

Tests which will not re-deploy container uses function
serviceSpecIsUpdated to make sure that service version is increased.

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
(cherry picked from commit b868ada474b5c214ed9bddb792dd36f794dc1fa6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ccc1abea092a54d99dec51345ef9303b4629572d
Component: engine
 2019-06-18 13:33:06 +01:00
Sebastiaan van Stijn 9d41ea2d82 integration: wait for service update to be completed 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8edcd4c3cd294bf276ffbe29bc58afbb006593b8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2ae0365c99627343d001a24e171fba2aa0fea791
Component: engine
 2019-06-18 13:33:02 +01:00
Arash Deshmeh 29d8b5118f migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit be151a73f0c0f362ff9775d2ff4d32329c01b8ba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4fe4e891723569fde7703747903289883db1dec0
Component: engine
 2019-06-18 13:32:59 +01:00
Andrew Hsu 630cd7d11b Merge pull request #257 from thaJeztah/18.09_backport_increase_swarmkit_grpc 
[18.09 backport] Increase max recv gRPC message size for nodes and secrets
Upstream-commit: ce2e2b672a7a3510419cb2706edab3fd7f12fd6c
Component: engine
 2019-06-17 12:31:27 -07:00
Andrew Hsu d25b6ea6fd Merge pull request #244 from thaJeztah/18.09_backport_fix_copying 
[18.09 backport] image: do actual RootFS.DiffIDs copying in Clone()
Upstream-commit: 423f39ab05d121e1aeb6e59732386fb50c17f49b
Component: engine
 2019-06-17 12:30:32 -07:00
Andrew Hsu 2bfd8549de Merge pull request #218 from thaJeztah/18.09_backport_EDGE374_TestDaemonNoSpaceLeftOnDeviceError 
[18.09 backport] explicitly set filesystem type for mount to avoid 'invalid argument' error on arm
Upstream-commit: 51ebfcbe423c679f06cfb37f7e6be565e0955639
Component: engine
 2019-06-17 12:28:35 -07:00
Andrew Hsu eae44d6a4c Merge pull request #223 from thaJeztah/18.09_backport_devno 
[18.09 backport] bugfix: fetch the right device number which great than 255
Upstream-commit: b236a1e78d35a62b164d00f4e19f59a556da8831
Component: engine
 2019-06-17 12:27:17 -07:00
Andrew Hsu 1b706a11a2 Merge pull request #276 from thaJeztah/18.09_backport_enable_new_integration_tests_for_win 
[18.09 backport] Enable integrations API tests for Windows CI
Upstream-commit: 49a4899c79f740e5a8e19df62ea341be9d5200be
Component: engine
 2019-06-17 12:26:34 -07:00
Andrew Hsu 75aeb78955 Merge pull request #242 from thaJeztah/18.09_swagger_fixes 
[18.09 backport] Swagger fixes
Upstream-commit: 556456701d1bd69a20f62d68d22257b8a6ad71c0
Component: engine
 2019-06-17 12:24:38 -07:00
Andrew Hsu 6a5e7a9ed6 Merge pull request #263 from thaJeztah/18.09_backport_39290alternate 
[18.09 backport] Windows: Don't attempt detach VHD for R/O layers
Upstream-commit: ab9db72ae809597b5fb7a9e245f18fa3f99857ec
Component: engine
 2019-06-17 12:23:41 -07:00
Andrew Hsu 7551e66a79 Merge pull request #250 from thaJeztah/18.09_backport_fix_fix_win_tmp 
[18.09 backport] Windows CI - Corrected LOCALAPPDATA location
Upstream-commit: d86fe18fc243c9d505403d50264a6db90e68e721
Component: engine
 2019-06-17 12:23:09 -07:00
Andrew Hsu 3317a78c8e Merge pull request #237 from thaJeztah/18.09_backport_remove_TestSearchCmdOptions 
[18.09 backport] Remove TestSearchCmdOptions test
Upstream-commit: 87c3750877aec0288945231af20362edc26c7a70
Component: engine
 2019-06-17 12:16:19 -07:00
Andrew Hsu b488dc3c6e Merge pull request #246 from thaJeztah/18.09_backport_log-daemon-exit-before-tests-finish 
[18.09 backport] Ensure all integration daemon logging happens before test exit
Upstream-commit: 08f6e9c14fd0de408db93914058d75df5b32ac67
Component: engine
 2019-06-17 12:15:43 -07:00
Andrew Hsu a99bdf7fc2 Merge pull request #269 from thaJeztah/18.09_backport_test_fixes 
[18.09 backport] Harden TestPsListContainersFilterExited
Upstream-commit: 6799eea8c80b506aeae54c1331b4b2ad834920bd
Component: engine
 2019-06-17 12:15:02 -07:00
Andrew Hsu 20e962774c Merge pull request #233 from thaJeztah/18.09_backport_update_seccomp_test_for_aarch64 
[18.09 backport] Update TestRunWithDaemonDefaultSeccompProfile for ARM64
Upstream-commit: 6809464a6395699b687fa0f0dfa190aa1d6d6547
Component: engine
 2019-06-17 12:13:46 -07:00
Andrew Hsu 0fafb25ad4 Merge pull request #245 from thaJeztah/18.09_backport_allow_version_overwrite 
[18.09 backport] Add ability to override the version in make.ps1
Upstream-commit: f07e4693278434c112870d30d80ad984bc79e527
Component: engine
 2019-06-17 12:11:50 -07:00
Andrew Hsu 1cd53e2273 Merge pull request #243 from thaJeztah/18.09_skip_test_info_warnings 
[18.09 backport] Skip TestInfoAPIWarnings on remote daemons
Upstream-commit: 8ec9dcfad74d349f62233c9ba053535dbd6f1405
Component: engine
 2019-06-17 12:11:14 -07:00
Andrew Hsu 422c678575 Merge pull request #262 from kolyshkin/18.09-backport-aufs-lock 
[18.09 backport ENGCORE-830] aufs optimizations #39107
Upstream-commit: 95d8b395a981bf09e9c10eac06efed9ed44ee456
Component: engine
 2019-06-17 11:57:12 -07:00
Andrew Hsu 0e2a6eacdc Merge pull request #248 from thaJeztah/18.09_backport_aufs_fixes 
[18.09 backport ENGCORE-830] layer store optimizations
Upstream-commit: 6b1354c52b94b7ace081d8e36abf71f6056d75f8
Component: engine
 2019-06-17 11:56:50 -07:00
Sebastiaan van Stijn 2db111a869 bump runc binary v1.0.0-rc8 
full diff: https://github.com/opencontainers/runc/compare/029124da7af7360afa781a0234d1b083550f797c...425e105d5a03fabd737a126ad93d62a9eeede87f

- opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4bc310c11babd2aa635eb08a5bbc198f96bc19b3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1a1bf23d17e44d22ebec2b1d0e38329bd35b0127
Component: engine
 2019-06-14 13:42:53 +02:00
Jintao Zhang 0c07852c42 Update runc 029124da7af7360afa781a0234d1b083550f797c 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit d43a41d7af7c4858e4b2ed41775c34b92cd35179)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce875b746bdcc37ff1c92dc181c78ba619d02d24
Component: engine
 2019-06-14 13:42:46 +02:00
Jintao Zhang 927d42432e Update containerd v1.2.6 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 8092cfb6e7396e0c5fc319b86ce9dca2246210f2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ae2ec3fbe75886d8d73f93c46ced33258d86929
Component: engine
 2019-06-14 13:42:42 +02:00
Olli Janatuinen c82a61bcb3 Enable integrations API tests for Windows CI 
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
(cherry picked from commit 2f22247cad9237d255a4b541a974705802abdad8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69503ef832fed199e28ccfd731281a4e439a8eeb
Component: engine
 2019-06-12 10:15:29 +02:00
zhangyue 223d3e0c75 fix: fix lack of copyUIDGID in swagger.yaml 
Signed-off-by: Zhang Yue <zy675793960@yeah.net>
Signed-off-by: zhangyue <zy675793960@yeah.net>
(cherry picked from commit a4f828cb8905f42c8b8975ce88e4d7aa8cd9bf74)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 705cc95eb1247c1983c39477f2ecf5cb4eb5edbb
Component: engine
 2019-06-07 14:38:39 +02:00
Dominic Tubach 861c5d670e API: Set format of body parameter in operation PutContainerArchive to "binary" 
Signed-off-by: Dominic Tubach <dominic.tubach@to.com>
(cherry picked from commit fa6f63e79b60d971460ee1fb8d449bdccc66cdfe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c3bf976a20ae18b628247088ff9935ce615337b8
Component: engine
 2019-06-07 14:38:27 +02:00
Adam Dobrawy 3e919def47 Update docs to remove restriction of tty resize 
Signed-off-by: Adam Dobrawy <naczelnik@jawnosc.tk>
(cherry picked from commit 4898f493d86129684c29d6cdfc6f65b49eb2ed29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2d1aa033a38e6a8b44b4a55a9285ebd80908e725
Component: engine
 2019-06-07 14:38:21 +02:00
Dominic Tubach 02856b256b API: Move "x-nullable: true" from type PortBinding to type PortMap 
Currently the API spec would allow `"443/tcp": [null]`, but what should
be allowed is `"443/tcp": null`
Signed-off-by: Dominic Tubach <dominic.tubach@to.com>
(cherry picked from commit 32b5d296ea5d392c28affe2854b9d4201166bc27)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3ee1e060fc9a31844064035cc3e8b76fddb8b341
Component: engine
 2019-06-07 14:38:18 +02:00
Dominic Tubach f29ee03a99 API: Change type of RemotrAddrs to array of strings in operation SwarmJoin 
Signed-off-by: Dominic Tubach <dominic.tubach@to.com>
(cherry picked from commit d5f6bdb027596b44244a6ce50555664b3a5ee4a7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d359834555628f67693cdf7eda246835b659a41c
Component: engine
 2019-06-07 14:38:16 +02:00
Sebastiaan van Stijn 2271e6653d Harden TestPsListContainersFilterExited 
This test runs on a daemon also used by other tests
so make sure we don't get failures if another test
doesn't cleanup or is running in parallel.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 915acffdb4cf95b934dd9872c1f54ea4487819b7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 05599804157a38db2eda84d3e8060a879b755ab7
Component: engine
 2019-06-07 14:32:51 +02:00