toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
42,711 Commits 3 Branches 295 Tags
4ce3c7be9afc5d0ebef9c1ea26d0af7b0d69ed84
Commit Graph

42711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
GordonTheTurtle
f5e87b54df Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-17 17:00:57 +00:00
Ian Campbell
7e7a37e63e e2e: assign a default value of 0 to DOCKERD_EXPERIMENTAL 
Currently running the e2e tests produces a warning/error:

    $ make -f docker.Makefile test-e2e
    «...»
    docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-cli-e2e
    ./scripts/test/e2e/run: line 20: test: : integer expression expected

This is from:

    test "${DOCKERD_EXPERIMENTAL:-}" -eq "1" && «...»

Where `${DOCKERD_EXPERIMENTAL:-}` expands to the empty string, resulting in
`test "" -eq "1"` which produces the warning. This error is enough to trigger
the short-circuiting behaviour of `&&` so the result is as expected, but fix
the issue nonetheless by provdiing a default `0`.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 4f483276cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c462e06fcd
Component: cli
 2018-12-17 17:23:04 +01:00
Akihiro Suda
130caf6e0e connhelper: add e2e 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 9b148db87a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 719508a935
Component: cli
 2018-12-17 17:22:58 +01:00
Andrew Hsu
b274d87a12 Merge pull request #140 from andrewhsu/d 
[18.09] libcontainerd: prevent exec delete locking
Upstream-commit: 484a3c3ad0fdb59ab9bb83ef2ff79184e216313f
Component: engine
 2018-12-17 16:15:27 +01:00
Tonis Tiigi
dba1b4aeda libcontainerd: prevent exec delete locking 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 332f134890246cfc73703b2911c9fdc20e063096)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6646d0878247b1e0875da33da606283f5d16ea07
Component: engine
 2018-12-17 12:07:32 +00:00
Andrew Hsu
b00fb7cf05 Revert "Propagate context to exec delete" 
This reverts commit b6430ba41388f0300ceea95c10738cbe1a9a7b10.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9ae6c7547466f754da01a53c6be455c555e6102
Component: engine
 2018-12-17 12:06:35 +00:00
GordonTheTurtle
af73095ae2 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-16 13:01:50 +00:00
Andrew Hsu
9f8d1a9995 Merge pull request #139 from andrewhsu/ctxt 
[18.09] Propagate context to exec delete
Upstream-commit: cc7773c787f400e7b11472878c3a1e55823e9c46
Component: engine
 2018-12-16 11:14:58 +00:00
Andrew Hsu
4f1cf45af7 Merge pull request #138 from andrewhsu/cont 
[18.09] Update containerd to aa5e000c963756778ab3ebd1a12c6
Upstream-commit: b2185081d90d6e192880a33dd0cc581a6bf81539
Component: engine
 2018-12-16 11:14:33 +00:00
GordonTheTurtle
b60801e6d4 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-15 01:03:25 +00:00
GordonTheTurtle
2eaec5333d Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-15 01:03:13 +00:00
GordonTheTurtle
3898ef4957 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-15 00:37:01 +00:00
Andrew Hsu
95c87c410e Merge pull request #137 from thaJeztah/18.09_bump_golang_1.10.6 
[18.09] Bump Golang 1.10.6 (CVE-2018-16875)
Upstream-commit: a6d4103450982521dbda0229d2f534e5717bfe63
Component: engine
 2018-12-14 23:23:09 +00:00
Michael Crosby
f72ff31415 Propagate context to exec delete 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 96e0ba1afb228b48aa6e08a90cfc665083d24ccc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: b6430ba41388f0300ceea95c10738cbe1a9a7b10
Component: engine
 2018-12-14 22:54:46 +00:00