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

39648 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
GordonTheTurtle
6ac22f3d8e Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-08-23 17:53:11 +00:00
GordonTheTurtle
0ee2fe2920 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-08-23 17:53:02 +00:00
Andrew Hsu
51edf81efb use systemctl is-active to check for containerd 
The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9
Component: packaging
 2018-08-23 16:57:41 +00:00
Eli Uriegas
dc460e810c Remove overlay as the default storage driver 
Should rely on list in the daemon

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 605758124d0750c14d24bfb1ebcf77d102591f4a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6cc81c2e8c95127baac275750bc544452fec7799
Component: packaging
 2018-08-23 16:39:44 +00:00
Eli Uriegas
6c6bc2f8c9 Remove linux-headers as a dependency 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 82258262f90bfaca3a2ef14e6b53238c2fac3147
Component: packaging
 2018-08-23 15:08:24 +00:00
Tibor Vass
cb322aa233 builder: fix bridge networking when using buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit dc7e472db986fa3c07806f56e82db756c47567fb)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 1d531ff64f99e07ac8733894416de8212a6c7278
Component: engine
 2018-08-23 05:32:51 +00:00
Eli Uriegas
45b43d2050 Wire up dependencies for debian, source -> . 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 99bbb6e33f46b6e2621204aac3b05344783ccfaa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3aeb8e9365fefea1be6e6b64624fccb81d5a70ad
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas
adca33ea9c Fix whitespace, add Dockerfile.engine to clean 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 831482a3296e9a7b1ad10f6b8c850a7a4095b881)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ce1d295cf4f7049dc48813d825511a85ebf7e9c1
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas
cea6d4e302 Make GO_IMAGE configurable, default to official go 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4cdbe08bf929d5c731b61e1cea217fa40156a3a8)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5bfb6ce9464fea13abc71fb6c12b9f5cb01a29a4
Component: packaging
 2018-08-22 23:28:39 +00:00
GordonTheTurtle
deaac15230 Merge component 'engine' from git@github.com:docker/engine master 2018-08-22 05:01:00 +00:00
Tibor Vass
ebad0ccbe4 builder: temporarily disable bridge networking when using buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 16084ea8c82fe3b3a0aae2573def0d1857365408
Component: engine
 2018-08-22 03:29:17 +00:00
Tibor Vass
b9ccf0e1c6 Merge pull request #37688 from tiborvass/features-not-flat 
Fix logic when enabling buildkit
Upstream-commit: ef50da44b30dd041896cfc6be45b777e10cc1d75
Component: engine
 2018-08-21 18:56:41 -07:00
GordonTheTurtle
6c90f5dd52 Merge component 'cli' from git@github.com:docker/cli master 2018-08-22 00:14:18 +00:00
Tibor Vass
65b88273a4 Merge pull request #37684 from thaJeztah/add_remote_api_warning 
Add warning if REST API is accessible through an insecure connection
Upstream-commit: 1cc3deebc40733fb6dcd98fbb5412399dc764876
Component: engine
 2018-08-21 16:52:37 -07:00
Tibor Vass
ed97b30d09 Fix logic when enabling buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c973cde7606dc7a2557094fc90d8e6bb595fa354
Component: engine
 2018-08-21 23:49:08 +00:00