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

42100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu
9eb3d3628d Merge pull request #553 from andrewhsu/tp5 
[18.09] bump ver to 18.09.0-ce-tp5
 2018-08-29 13:53:49 -07:00
Andrew Hsu
038ccb8c79 bump ver to 18.09.0-ce-tp5 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-29 20:03:52 +00:00
GordonTheTurtle
c51c7e3122 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-08-29 16:36:56 +00:00
Vincent Demeester
3d47abb1d1 Merge pull request #1322 from thaJeztah/18.09_backport_bump_kube_deps 
[18.09] backport: bump kube dependency to 1.11.2
Upstream-commit: a818677813
Component: cli
 2018-08-29 17:56:26 +02:00
Vincent Demeester
593e7b7d05 Merge pull request #1323 from thaJeztah/18.09_backport_bump_golang_1.10.4 
[18.09] backport: bump Go to 1.10.4
Upstream-commit: c204959687
Component: cli
 2018-08-29 15:32:30 +02:00
Sebastiaan van Stijn
199effc58c Bump Go to 1.10.4 
Includes fixes to the go command, linker, and the net/http, mime/multipart,
ld/macho, bytes, and strings packages. See the Go 1.10.4 milestone on the
issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.10.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 44ca0901d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 76c09259db
Component: cli
 2018-08-29 15:19:34 +02:00
Marcus Martins
6378b2a9e2 Bump kube dependency to 1.11.2 
Bump our kube dependencies to the latest patch
level for kube 1.11.

Signed-off-by: Marcus Martins <marcus@docker.com>
(cherry picked from commit c67e05796b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0efb62cab1
Component: cli
 2018-08-29 14:59:20 +02:00
GordonTheTurtle
b621aec086 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-29 06:31:07 +00:00
Andrew Hsu
e93312430e Merge pull request #173 from andrewhsu/se 
[18.09] add requires container-selinux to spec
Upstream-commit: 3e1fd2ba5b9aaf19eff1880092c165e96e42a13a
Component: packaging
 2018-08-28 22:12:02 -07:00
GordonTheTurtle
3f43cbacf5 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-29 05:00:53 +00:00
GordonTheTurtle
bc725764d9 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-08-29 04:36:33 +00:00
Andrew Hsu
39bc439e8b add requires container-selinux to spec 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e4b1c10a6b99b875cd5e37bbfef0b9a6ce58a518
Component: packaging
 2018-08-29 04:23:49 +00:00
Andrew Hsu
fc6d931f21 Merge pull request #172 from dhiltgen/seccomp_dep 
[18.09] Add explicit dependency for libseccomp2
Upstream-commit: f0a0c5acba3f6bb7285853f44a17ecd5d4638219
Component: packaging
 2018-08-28 21:06:40 -07:00
Andrew Hsu
9823e5c1f0 Merge pull request #1313 from dhiltgen/product_license 
[18.09] Expose product license in info output
Upstream-commit: 8789e93d6e
Component: cli
 2018-08-28 21:05:09 -07:00
docker-unir[bot]
8a8398e8e4 Merge pull request #165 from dhiltgen/platform 
Merged with https://github.com/seemethere/unir
Upstream-commit: bb9b1d3c1cddaf58bdb83931a1f1e35f88b07fbc
Component: packaging
 2018-08-29 03:51:49 +00:00
Andrew Hsu
eaabc7f477 Merge pull request #1312 from dhiltgen/dual_keys 
[18.09] Add support for multiple signing keys
Upstream-commit: 0ee05a6353
Component: cli
 2018-08-28 20:51:22 -07:00
Daniel Hiltgen
68a6e99be4 Expose product license in info output 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 68be7cb376
Component: cli
 2018-08-28 20:10:09 -07:00
GordonTheTurtle
a527889f83 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-29 01:08:10 +00:00
GordonTheTurtle
1512b5833d Merge component 'cli' from git@github.com:docker/cli 18.09 2018-08-29 00:41:41 +00:00
Andrew Hsu
ad82a267b6 Merge pull request #171 from andrewhsu/ps 
[18.09] Add post-stop
Upstream-commit: 66ad326a35cba7a1d8dd1be2b445e3bdff40d576
Component: packaging
 2018-08-28 17:41:35 -07:00
Daniel Hiltgen
3a6b03f884 Add explicit dependency for libseccomp2 
While testing on older ubuntu images we discovered
we do depend on a newer version of libseccomp2.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f2ceca98823548e401c6cca125b7057df28c4892
Component: packaging
 2018-08-28 17:07:43 -07:00
Michael Crosby
cc5399a50d Add post-stop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 5f4b9c0eab3978e491ff249aacffb2338bf2408a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 89d78463660094d24878c9060d7ef45dddc7546b
Component: packaging
 2018-08-28 23:31:50 +00:00
docker-unir[bot]
95ea0f1d1a Merge pull request #170 from jose-bigio/bump_ubuntu_epoch 
Merged with https://github.com/seemethere/unir
Upstream-commit: e7ab731876d3f33c70d7d0767193920ffc30d986
Component: packaging
 2018-08-28 23:19:20 +00:00
Andrew Hsu
b266ca7c3b Merge pull request #1317 from dhiltgen/play_nice_with_proxy 
Update proxy config if present
Upstream-commit: de805da04c
Component: cli
 2018-08-28 15:01:56 -07:00
Andrew Hsu
80cd126e9a Merge pull request #1311 from dhiltgen/fix_progress 
[18.09] Fix progress reporting for containerd pulls
Upstream-commit: b75350de7a
Component: cli
 2018-08-28 14:59:59 -07:00
GordonTheTurtle
52ba084f01 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-28 21:01:37 +00:00
Jose Bigio
85c6730591 Bump the epoch from 2 to 3 for deb packages 
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 4f3c49bc920bd125aeeea546d48c561f317c4c37
Component: packaging
 2018-08-28 13:27:01 -07:00
docker-unir[bot]
292dd4d5bd Merge pull request #167 from seemethere/suffix 
Merged with https://github.com/seemethere/unir
Upstream-commit: 080c2c5b30b2f1cd5997b1e03fd04d7ef1aebdd1
Component: packaging
 2018-08-28 20:21:38 +00:00
Eli Uriegas
40dd03795f Specify suffix for DEB_VERSION 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6c5b7fcb956871f7a44e1a478ad9450f9df4bed1
Component: packaging
 2018-08-28 17:24:58 +00:00
Daniel Hiltgen
be6ee8f3d3 Update proxy config if present 
If the system has a containerd-proxy managing the lifecycle
of the daemon, make sure the config is updated with the new image
on update.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f96ddaedf7
Component: cli
 2018-08-28 10:11:44 -07:00
Daniel Hiltgen
abe3a13a71 Add support for multiple signing keys 
Basic enterprise licenses and platform license keys will be signed with
two different keys in the upcoming release.  This adds support for the
CLI to support both variants.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 0fb6bb35a4
Component: cli
 2018-08-27 15:20:30 -07:00
Daniel Hiltgen
ab04682b19 Vendor bump for licensing library to support multiple signing keys 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 264ee43c2a
Component: cli
 2018-08-27 15:20:19 -07:00
Daniel Hiltgen
64587cac6e Fix progress reporting for containerd pulls 
During refactoring of the implementation PR progress reporting
was broken.  This gets the progress reporting back in action.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 7f4c842e8a
Component: cli
 2018-08-27 14:44:13 -07:00
GordonTheTurtle
c73f38b967 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-08-27 16:37:00 +00:00
Sebastiaan van Stijn
72ee90b9b2 Merge pull request #1310 from thaJeztah/18.09-backport_update-docs 
[18.09] backport: update docs with the new features option in daemon.json
Upstream-commit: e25e9d68be
Component: cli
 2018-08-27 13:46:15 +02:00
Anda Xu
b7cdcaa0cf update docs with the new features option in daemon.json 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 3e0b0a6692)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6877dedeee
Component: cli
 2018-08-27 11:51:39 +02:00
Daniel Hiltgen
4ca20bcd76 Add build date per upstream moby pattern 
This adds a build date using the same pattern as upstream
https://github.com/moby/moby/blob/master/hack/make.sh#L69

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: c443439189fdc40c012ef5ac6cf592d32f478b54
Component: packaging
 2018-08-24 17:19:51 -07:00
Daniel Hiltgen
12f331f6b2 Expose the platform string for community builds 
This encodes the platform as "Docker Engine - Community"
for community engines

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 4d9fd7d17f3aab3463baf6030072f5789a003a74
Component: packaging
 2018-08-24 17:05:42 -07:00
Andrew Hsu
33764aa4ae Merge pull request #552 from andrewhsu/tp4 
[18.09] bump ver to 18.09.0-ce-tp4
 2018-08-24 16:03:37 -07:00
GordonTheTurtle
217d24056c Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-24 23:01:13 +00:00
Andrew Hsu
90b540baa9 Merge pull request #164 from andrewhsu/rsec 
[18.09] added RestartSec
Upstream-commit: e551ce432933cc841103688852390768c2eeda0d
Component: packaging
 2018-08-24 15:45:36 -07:00
Andrew Hsu
3e2da1ea70 added RestartSec 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3614f5dc4eb20e0d028ee1b2fd4bc23d34815f39
Component: packaging
 2018-08-24 22:40:02 +00:00
Andrew Hsu
b1e2655de1 bump ver to 18.09.0-ce-tp4 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-24 22:24:43 +00:00
Andrew Hsu
8f960d9901 Merge pull request #162 from andrewhsu/cprox 
[18.09] update containerd proxy commit to afca176
Upstream-commit: ad501c8f80636b3446db0a15d6a9da8ccfd65ccd
Component: packaging
 2018-08-24 15:19:12 -07:00
Andrew Hsu
546163ada0 update containerd proxy commit to afca176 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: eea6967f5de4835800349b1bcf2b81de8fd92207
Component: packaging
 2018-08-24 22:14:20 +00:00
GordonTheTurtle
357d520355 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-24 19:54:36 +00:00
Eli Uriegas
bcac5c18d0 Merge pull request #160 from dhiltgen/fix_scope 
[18.09] Make engine scope a build time setting
Upstream-commit: 4a425676ac9183011f84fafda1a103fe93121dd1
Component: packaging
 2018-08-24 12:01:27 -07:00
Daniel Hiltgen
66e16d32fe Make engine scope a build time setting 
This should make it easier to change downstream builds
to change the scope.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 72406691244c12d5360889f8658bd4989b588364
Component: packaging
 2018-08-24 11:40:42 -07:00
Eli Uriegas
ca36ebeff9 Merge pull request #550 from seemethere/v 
[18.09] bump version to 18.09.0-ce-tp3
 2018-08-23 11:02:40 -07:00
Eli Uriegas
b5ee375fd4 bump version to 18.09.0-ce-tp3 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-08-23 17:59:49 +00:00