toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,725 Commits 3 Branches 295 Tags
9f42d6f4aa1c136e6f574880b2eb81ac432b412d
Commit Graph
42725 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 9f42d6f4aa Merge component 'engine' from git@github.com:docker/engine 18.09 2019-02-13 17:04:21 +00:00
Andrew Hsu a6fcb60427 Merge pull request #147 from thaJeztah/18.09_bump_golang_1.10.8 
[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
Upstream-commit: 02b07d4ede1af6b9186d7e2f7b712dfe6fbea994
Component: engine
 2019-02-13 08:20:56 -08:00
GordonTheTurtle cedb2b83c6 Merge component 'engine' from git@github.com:docker/engine 18.09 2019-02-13 13:03:40 +00:00
Sebastiaan van Stijn f3d6952b68 Merge pull request #150 from thaJeztah/18.09_backport_fix_pkg_archive_xattr_test 
[18.09 backport] pkg/archive: fix TestTarUntarWithXattr failure on recent kernel
Upstream-commit: caabacdda57eb5a9acd870018d3b8805784a3255
Component: engine
 2019-02-13 12:09:06 +01:00
GordonTheTurtle 735870ea3d Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2019-02-13 05:04:07 +00:00
Eli Uriegas fc58c203b0 Merge pull request #294 from thaJeztah/18.09_backport_start_dockerd_after_containerd 
[18.09 backport] Start docker.service after containerd.service
Upstream-commit: f3af90aee7be272775ac11b8906e91729e47b517
Component: packaging
 2019-02-12 18:27:03 -08:00
Eli Uriegas 6a2cf28a77 Merge pull request #298 from thaJeztah/18.09_backport_fix_containerd_race_condition 
[18.09 backport] systemd: set --containerd socket patch to prevent race-condition
Upstream-commit: 8a4654e98e76d845e59b373ddee57fa4c1db8954
Component: packaging
 2019-02-12 18:25:59 -08:00
GordonTheTurtle 2cb298c22b Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2019-02-12 21:03:57 +00:00
docker-unir[bot] 93dc56c138 Merge pull request #293 from thaJeztah/18.09_bump_golang_1.10.8 
Merged with https://github.com/seemethere/unir
Upstream-commit: c7bc734ebfe74b6dd3bf298dd384b6860f4a7e74
Component: packaging
 2019-02-12 19:59:07 +00:00
Akihiro Suda 58654c0a23 pkg/archive: fix TestTarUntarWithXattr failure on recent kernel 
Recent kernel has strict check for security.capability value.
Fix #38289

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 9ddd6e47a90ac056d242969ff72bf75a43cc0004)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d158b9e74fffe377b6acc7794246c89f9fb26d2f
Component: engine
 2019-02-12 00:13:23 +01:00
GordonTheTurtle 4ce3c7be9a Merge branch '18.09' of github.com:docker/docker-ce into 18.09 2019-02-11 17:03:37 +00:00
GordonTheTurtle bd29eaad5a Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2019-02-11 17:03:35 +00:00
Eli Uriegas e1aeaae20a Change back to public forks 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-02-11 16:54:46 +00:00
Sebastiaan van Stijn 24e4136d6c systemd: set --containerd socket patch to prevent race-condition 
containerd is now running as a separate service, and should
no longer be started as a managed child-process of dockerd.

The dockerd service already specifies that it should be started
`After` the containerd.service, but there is still a race
condition, where containerd is started, but its socket is not yet
created.

In that situation, `dockerd` detects that the containerd socket
is missing, and will start a new instance of containerd (as a
managed child-process), which causes live-restore to fail.

This patch explicitly sets the `--containerd` daemon option.
If this option is set, `dockerd` will not start a new instance
of containerd.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1985463b1337e55c0dfcad2fb985fb5af5a10c78)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 15653df497646518ec5af5cab55ebb4461ee5b80
Component: packaging
 2019-02-11 14:41:33 +01:00
Sebastiaan van Stijn a6dbf1f21f [18.09] Bump Golang 1.10.8 (CVE-2019-6486) 
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 325f6ee47a8edaf093ea9f829c26962310c83759
Component: engine
 2019-02-09 11:05:52 +01:00
Eli Uriegas 62479626f2 Merge pull request #475 from andrewhsu/1809ce 
[18.09-ce] ENGSEC-44 bump ver 18.09.2 and update changelog
 2019-02-08 19:21:53 -08:00
Andrew Hsu 408de3fdc3 bump ver 18.09.2 and update changelog 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-02-09 00:31:17 +00:00
Eli Uriegas 41a97638d5 Merge component 'engine' from git@github.com:docker/ee-engine 18.09-ce 2019-02-08 23:27:48 +00:00
Eli Uriegas 94f8285a9c Merge component 'packaging' from git@github.com:docker/ee-packaging 18.09-ce 2019-02-08 22:59:52 +00:00
Eli Uriegas 3503a4d782 Switch to private forks for now 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-02-08 22:59:33 +00:00
Andrew Hsu e6c583ac99 Merge pull request #167 from seemethere/req_g_ce 
[18.09-ce] [ENGSEC-52] Bump containerd.io dep >= 1.2.2-3 (CVE-2019-5736)
Upstream-commit: f2862f5f21cfbf2dd2ce84b213de5196879b6e9b
Component: packaging
 2019-02-08 14:41:20 -08:00
Eli Uriegas 4d35d88be8 Bump containerd.io dep >= 1.2.2-3 (CVE-2019-5736) 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 06b649e2b07f74a94f3dbbcb233e13177a76a929
Component: packaging
 2019-02-08 21:40:09 +00:00
Andrew Hsu 4f8ff9b127 Merge pull request #463 from andrewhsu/18.09-ce-tp3 
bump ver 18.09.2-tp3
 2019-02-07 14:47:00 -08:00
Andrew Hsu 28242bbbd2 bump ver 18.09.2-tp3 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-02-07 18:30:33 +00:00
Andrew Hsu 71adfb3f74 Merge pull request #240 from seemethere/bundle_me_up_1809 
[18.09-ce] [ENGSEC-30] CVE-2019-5736 apply fix via git bundle instead of patches
Upstream-commit: eb137ff1765faeb29c2d99025bfd8ed41836dd06
Component: engine
 2019-02-06 15:39:49 -08:00
Eli Uriegas e4931e664f Apply git bundles for CVE-2019-5736 
A git bundle allows us keep the same SHA, giving us the ability to
validate our patch against a known entity and allowing us to push
directly from our private forks to public forks without having to
re-apply any patches.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 03dfb0ba53cc5f64b746a25aa5ed8a48763ea223
Component: engine
 2019-02-06 00:25:54 +00:00
corbin-coleman 52d14c96c7 Start docker.service after containerd.service 
Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
(cherry picked from commit 27f7ae18f42d10221c214163e253ba79b79731d8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 00600cd1217bd545762dbef7c488136735d662b6
Component: packaging
 2019-01-25 14:00:33 +01:00
GordonTheTurtle 58fb11cbab Merge component 'cli' from git@github.com:docker/cli 18.09 2019-01-24 16:37:08 +00:00
Sebastiaan van Stijn 22e12bdcfc Merge pull request #1634 from thaJeztah/18.09_bump_golang_1.10.8 
[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
Upstream-commit: af2647d55b
Component: cli
 2019-01-24 14:27:59 +01:00
Sebastiaan van Stijn 37fd1a0d0a [18.09] Bump Golang 1.10.8 (CVE-2019-6486) 
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c71aa11c0a
Component: cli
 2019-01-24 02:07:03 +01:00
Sebastiaan van Stijn 1f467bcdc6 [18.09] Bump Golang 1.10.8 (CVE-2019-6486) 
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9aec27794cc1e702bd9b9f3ac476695fc0d522a4
Component: packaging
 2019-01-23 23:59:33 +01:00
Eli Uriegas 4c52b901c6 Merge pull request #581 from seemethere/bump_v 
[18.09] Bump version to 18.09.1
 2019-01-09 11:00:56 -08:00
GordonTheTurtle 6caccb221d Merge component 'engine' from git@github.com:docker/engine 18.09 2019-01-09 18:03:09 +00:00
Jameson Hyde 006734c577 If url includes scheme, urlPath will drop hostname, which would not match the auth check 
Signed-off-by: Jameson Hyde <jameson.hyde@docker.com>
(cherry picked from commit 754fb8d9d03895ae3ab60d2ad778152b0d835206)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a79fabbfe84117696a19671f4aa88b82d0f64fc1
Component: engine
 2019-01-09 17:31:53 +00:00
Jameson Hyde 0b021f6648 Authz plugin security fixes for 0-length content and path validation Signed-off-by: Jameson Hyde <jameson.hyde@docker.com> 
fix comments

(cherry picked from commit 9659c3a52bac57e615b5fb49b0652baca448643e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: fc274cd2ff4cf3b48c91697fb327dd1fb95588fb
Component: engine
 2019-01-09 17:31:53 +00:00
Eli Uriegas 91c5fffc4b Bump version to 18.09.1 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-01-08 23:52:20 +00:00
GordonTheTurtle 5110db8f4f Merge component 'engine' from git@github.com:docker/engine 18.09 2019-01-08 21:03:27 +00:00
Eli Uriegas 6cab4a9c3e Merge pull request #144 from thaJeztah/18.09_backport_bump_containerd_v1.2.2 
[18.09 backport] Bump containerd to v1.2.2
Upstream-commit: d4f336d8ef43ca86c914952eeb44cc4489755d20
Component: engine
 2019-01-08 10:05:03 -08:00
Sebastiaan van Stijn 2a881442fb Bump containerd to v1.2.2 
- Fix a bug that a container can't be stopped or inspected when its corresponding image is deleted
- Fix a bug that the cri plugin handles containerd events outside of k8s.io namespace

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27cc170d2891f25ab066620e8fe94d62f81b9aa3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f80c6d7ae15443f15c014ddbd17e30cfac47b906
Component: engine
 2019-01-08 02:45:06 +01:00
GordonTheTurtle d5a7bda9e8 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-29 01:03:31 +00:00
Sebastiaan van Stijn 06f6e415e9 Merge pull request #142 from docker/revert-130-18.09_backport_fix_api_return_code 
Revert "[18.09 backport] API: fix status code on conflicting service names"
Upstream-commit: ce8b8f1cf33bb33811077be3b0b972dd2dbc4c79
Component: engine
 2018-12-28 21:50:02 +01:00
Madhu Venugopal 8c0e7ea89c Revert "[18.09 backport] API: fix status code on conflicting service names" 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 24f71e39980e8a4c6eabcea16e0a9efce1660bbe
Component: engine
 2018-12-28 09:40:26 -08:00
GordonTheTurtle 2e95726fa5 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-27 21:04:16 +00:00
Eli Uriegas ded83fc61b Merge pull request #286 from paddy-hack/restore-sysvinit-and-upstart-support 
Restore SysVinit and Upstart support
Upstream-commit: d22718c0006e7ebb5afe8a832537ffa6273fbccf
Component: packaging
 2018-12-27 14:12:46 -06:00
Olaf Meeuwissen ffc8511d04 Restore SysVinit and Upstart support 
This was removed in 662e248f680eb49a9951a8b34125506b8f82dfed.  The
removal breaks usage on Debian derivatives that do not use systemd
(see https://github.com/docker/for-linux/issues/482).
Upstream-commit: 196c4028288ad241f52201d0f171c251ed13b98f
Component: packaging
 2018-12-23 20:12:09 +09:00
GordonTheTurtle 2df4905f67 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-19 16:37:00 +00:00
Tibor Vass c6a63b52bb Merge pull request #1580 from thaJeztah/18.09_backport_e2e-invocation-nit 
[18.09 backport] e2e updates
Upstream-commit: 336b2a5cac
Component: cli
 2018-12-19 14:20:03 +01:00
GordonTheTurtle 8053e79119 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-18 13:04:01 +00:00
docker-unir[bot] 9da07880a0 Merge pull request #284 from thaJeztah/18.09_backport_cli_does_not_obsolete_selinux_and_engine 
Merged with https://github.com/seemethere/unir
Upstream-commit: b9bfa649ce53d93136fe1437795498902efde81e
Component: packaging
 2018-12-18 12:50:13 +00:00
Sebastiaan van Stijn 2b827d4782 Remove obsolete "selinux" and "engine" packages from CLI rpm 
The CLI package does not provide the functionality of the
"selinux" and "engine" packages (it does _conflict_ with
older engine packages though).

This removes the "obsoletes" from the CLI package, as the
Engine package already obsoletes the other ones.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4e1ddb963a43ff9f0a06e4ed1b37307c8f26a17)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9e6f124b6b5deba3878ad242661d1991881f33b9
Component: packaging
 2018-12-17 18:04:48 +01:00