toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,785 Commits 3 Branches 295 Tags
a0a268737c8b17525eb7b48a9fb1af14f90ac20b
Commit Graph
36785 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hernan Garcia a0a268737c fixed word network on volume_ls.md 
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
(cherry picked from commit f5bca7af10)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 03:07:23 +02:00
Sebastiaan van Stijn c2b2ea1702 Service privileges: CLI reference docs & completion 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5cc7ac2990)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:42 +02:00
Daniel Nephin 068aa8ed63 More about ARG and build stages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit ad5d035988)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:34 +02:00
Daniel Nephin 9f144cca26 Clarify docs about ARG in FROM 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 2880030814)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:26 +02:00
yuexiao-wang bf1f505a77 Fix filters displaying for docker search 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit bd64ad25fb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:18 +02:00
allencloud 0cd4fd721d docs: add filter scope for command events and more cluster events 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 8639c9baf8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:07 +02:00
Valentin Lorentz 860f79a6d4 Fix typo (proceed -> precede) 
Signed-off-by: Valentin Lorentz <progval+git@progval.net>
(cherry picked from commit 4f3a8aecad)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:35:00 +02:00
Boaz Shuster 7f0cfc1090 Update the cp command docs to include archive 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
(cherry picked from commit e4c70d390d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-25 02:34:51 +02:00
Andrew Hsu 19fe49f4b2 Merge pull request #121 from cyli/secrets-userns-fix 
[17.06.1] Backport engine userns secrets-mounting fix
 2017-07-24 14:33:01 -07:00
Victor Vieux 8bdf679283 Merge pull request #117 from tiborvass/fix-live-restore 
[engine] Graceful upgrade of containerd and runc state files upon live-restore
 2017-07-24 14:18:26 -07:00
Tibor Vass 358c36e930 [engine] Graceful upgrade of containerd and runc state files upon live-restore 
Vendors new dependency github.com/crosbymichael/upgrade

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-07-22 05:54:46 +00:00
Justin Cormack b31456f2cb In the case of remounting with changed data, need to call mount 
The case where we are trying to do a remount with changed filesystem specific options was missing,
we need to call `mount` as well here to change those options.

See #33844 for where we need this, as we change `tmpfs` options.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 3a1ab5b479ce843648cf676fbaaf2bec9e040dce)
Signed-off-by: Ying <ying.li@docker.com>
 2017-07-18 11:38:49 -07:00
Andrew Hsu 77b4dce066 Merge pull request #120 from andrewhsu/check-clean 
check if build dir exists before chown
v17.06.1-ce-rc1 		2017-07-13 22:15:52 -07:00
Andrew Hsu 9cb6e86615 check if build dir exists before chown 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 46dd23f1fc2863741783f0584dad1a42815e5438)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-14 04:51:59 +00:00
Andrew Hsu 4581021c2e Merge pull request #119 from andrewhsu/alpine-image 
[17.06] Add reflective alpine images to other components
 2017-07-13 17:42:40 -07:00
Andrew Hsu 70709d0056 Merge pull request #101 from andrewhsu/changelog-rc1 
update changelog for docker-ce 17.06.1 rc1
 2017-07-13 17:42:14 -07:00
Andrew Hsu 54ea1fe30f added fixes addressed in 17.06.1 rc1 
From: https://github.com/docker/docker-ce/milestone/2?closed=1

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-14 00:40:15 +00:00
Eli Uriegas 06dcd93778 ALPINE -> ALPINE_IMG 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit ee25bc2379126a75116ce66daffda6c7d3f41d42)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 23:41:46 +00:00
Eli Uriegas 1d2cd8d7ab Add reflective alpine images to other components 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 0435cef6a945dc1c57b51cb24b36aaf66be8d8cc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 23:41:46 +00:00
Andrew Hsu c257617b99 Merge pull request #118 from andrewhsu/rc1 
bump version to 17.06.1-ce-rc1
 2017-07-13 16:03:01 -07:00
Andrew Hsu 06f434c72b Merge pull request #108 from andrewhsu/fix-load-image 
[17.06] backport fix "Stop trying to load images on an incompatible OS"
 2017-07-13 12:04:27 -07:00
Andrew Hsu 1d1b9ad4db Merge pull request #115 from andrewhsu/set-ping-ver 
[17.06] Set ping version even on error
 2017-07-13 11:59:16 -07:00
Andrew Hsu ab734f59cc Merge pull request #105 from andrewhsu/backport-doc-fixes 
[17.06] backport various docs fixes
 2017-07-13 11:54:25 -07:00
Kenfe-Mickaël Laventure b538302e2c Merge pull request #90 from andrewhsu/fix-leak 
[17.06] Prevent a goroutine leak when healthcheck gets stopped
 2017-07-13 13:58:07 +02:00
Andrew Hsu 021cd82205 import runtime so cherry-pick moby/moby@b9255e4 can work 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 04:26:09 +00:00
Andrew Hsu 3c4292da1e vendor prev git commit 10aa812 into components/cli 
Originally from commit titled: Set ping version even on error
which was cherry picked from upstream commit 27ef09a of component engine.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 04:10:32 +00:00
Brian Goff 10aa812ef5 Set ping version even on error 
In some cases a server may return an error on the ping response but
still provide version details. The client should use these values when
available.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 27ef09a46ffeb8ba42548de937b68351009f30ea)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 03:55:49 +00:00
Andrew Hsu 9795a158bd Merge pull request #110 from andrewhsu/fix-swarm-warn 
[17.06] backport (cli) If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
 2017-07-12 19:01:59 -07:00
Andrew Hsu fb319d1554 Merge pull request #114 from cyli/re-vendor-swarmkit 
[17.06] backport (swarmkit) cluster update and memory issue fixes
 2017-07-12 17:34:49 -07:00
Ying Li 3d947e7a2d Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed, 
and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 4615c92f66)

Conflicts:
components/cli/cli/command/swarm/ca_test.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-13 00:25:00 +00:00
Andrew Hsu 31875af469 adjust cherry-pick moby/moby@b9255e4 to work without lcow 
Because the LCOW support is not part of this codebase, removing the
lines that expect it to be there.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-12 22:56:09 +00:00
Andrew Hsu 136b90fbd0 Merge pull request #102 from tiborvass/runtime-spec-fix 
[17.06][engine][vendor] forks of containerd + runc + runtime-spec
 2017-07-12 15:29:33 -07:00
Ying 9241ec7a1e Bump swarmkit vendor in order to include the following changes: 
- https://github.com/docker/swarmkit/pull/2281 - fixes an issue where some cluster updates
  could be missed if a manager receives a catch-up snapshot from another manager
- https://github.com/docker/swarmkit/pull/2300 - fixes a possible memory issue if an
  external CA sends an overlarge response

Signed-off-by: Ying <ying.li@docker.com>
 2017-07-12 14:50:21 -07:00
Andrew Hsu aaf863d88a Merge pull request #100 from andrewhsu/fix-build-git 
[17.06] Fix handling of remote "git@" notation
 2017-07-12 14:43:27 -07:00
Andrew Hsu 2d8beb7256 Merge pull request #95 from andrewhsu/fix-logging 
[17.06] Fix stderr logging for journald and syslog
 2017-07-12 14:40:48 -07:00
Andrew Hsu 7a50b06fea Merge pull request #99 from andrewhsu/redact 
[17.06] middleware: Redact secret data on "secret create"
 2017-07-12 14:37:44 -07:00
Andrew Hsu 2e99eed6f1 Merge pull request #89 from tonistiigi/fix-add-remote 
[17.06] build: fix add from remote url
 2017-07-12 10:38:32 -07:00
Andrew Hsu cb9b544edf Merge pull request #107 from andrewhsu/fix-service-spec 
[17.06] backport "Do not add duplicate platform information to service spec"
 2017-07-12 10:35:50 -07:00
Kenfe-Mickaël Laventure 1e1c6b20ef Merge pull request #109 from andrewhsu/dont-prune-vol 
[17.06] backport (cli) Don't prune volumes on docker system prune
 2017-07-12 09:11:43 +02:00
John Stephens dfe4a1d9f2 Stop trying to load images on an incompatible OS 
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit b9255e4a531d2ad0239481eba2a635f7d48718fb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-12 04:33:36 +00:00
Andrew Hsu abfc72adff Merge pull request #92 from andrewhsu/fix-relabel 
[17.06] Do not error on relabel when relabel not supported
 2017-07-11 21:29:47 -07:00
Andrew Hsu b5f090a4fe Merge pull request #113 from andrewhsu/optimize-dockerfile 
[17.06] Remove OSX cross stuff from main Dockerfile
 2017-07-11 21:25:42 -07:00
Tibor Vass 2206628703 [engine][vendor] forks of containerd + runc + runtime-spec 
This vendors from the docker org:
- containerd to 6e23458c129b551d5c9871e5174f6b1b7f6d1170
- runc to 810190ceaa507aa2727d7ae6f4790c76ec150bd2
- runtime-spec to a45ba0989fc26c695fe166a49c45bb8b7618ab36

This fixes two issues:
- if the container is paused, it now responds properly to SIGKILL
- on buggy kernels such as RHEL7.2, a int64->uint64 conversion bug
  prevented containers to start when memory cgroup was specified.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-07-12 03:13:56 +00:00
Andrew Hsu 068a4285c6 Merge pull request #106 from andrewhsu/fix-wait-hang 
[17.06] Docker wait hangs indefinitely for non-existent container (vendor)
 2017-07-11 19:06:58 -07:00
Andrew Hsu f1d6145f7b Merge pull request #104 from andrewhsu/backport-completion-scripts 
[17.06] backport various completion script updates
 2017-07-11 19:03:29 -07:00
Andrew Hsu 0aba54445b Merge pull request #98 from andrewhsu/fix-log-readers 
[17.06] Fix log readers can block writes indefinitely
 2017-07-11 19:01:53 -07:00
Andrew Hsu 75ef04b420 Merge pull request #94 from andrewhsu/fix-grpc 
[17.06] Limit max backoff delay to 2 seconds for GRPC connection
 2017-07-11 18:59:44 -07:00
Brian Goff 5c477f0e07 Remove OSX cross stuff from main Dockerfile 
This is no longer needed here. It was required for compiling the CLI
which we no longer do here.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 57f0e0c61982269093eb6d9934656ea70b573938)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-12 01:52:53 +00:00
Andrew Hsu b2eb1339dc Merge pull request #91 from andrewhsu/fix-plugin 
[17.06] Make plugin removes more resilient to failure
 2017-07-11 18:37:42 -07:00
Brian Goff 4ff004bf0d Do not error on relabel when relabel not supported 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5768b74e0a52875cf76a0576bfcd66445c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-07-12 01:17:55 +00:00