toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,084 Commits 3 Branches 295 Tags
bc725764d99a90366b2558695002a23bc6c10c9d
Commit Graph
42084 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle bc725764d9 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-08-29 04:36:33 +00: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
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
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
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
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
Eli Uriegas 5e417d9bd2 Merge pull request #158 from andrewhsu/ac 
[18.09] use systemctl is-active to check for containerd
Upstream-commit: 7e5cc1a95e11a48148f1972d625322ae1399c0bc
Component: packaging
 2018-08-23 09:59:48 -07: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 97dd93e978 Merge pull request #157 from seemethere/remove_overlay_1809 
[18.09] Remove overlay as the default storage driver
Upstream-commit: 54dc76c596e5f5fe8ee76e65a0ac601f8a1d8e8b
Component: packaging
 2018-08-23 09:44:14 -07: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 dbb89de17a Merge pull request #155 from seemethere/fix_up_dockerfile_1809 
[18.09] Fix up Dockerfile.engine to compile docker-proxy statically
Upstream-commit: 9162117ba4c76ad329c4c4abeab02b91e76cbd4c
Component: packaging
 2018-08-23 08:50:54 -07: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 46e2c8ce3b Merge pull request #35 from tiborvass/18.09-fix-network-buildkit 
[18.09] builder: fix bridge networking when using buildkit
Upstream-commit: be371291bcbf5ce89ed5d9122d046ff18f8fdaba
Component: engine
 2018-08-23 06:21:34 -07: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
Andrew Hsu 4bb0619413 Merge pull request #548 from seemethere/ignore_tars 
[18.09] Ignore tar's
 2018-08-22 10:58:23 -07:00
Eli Uriegas df8a9dde61 Ignore tar's 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-08-22 17:56:22 +00:00
Andrew Hsu 729a38cb5a Merge pull request #546 from seemethere/gitignore_1809 
[18.09] Update gitignore to ignore more files
 2018-08-22 10:05:12 -07:00