1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

17625 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
c193653d08 Merge pull request #15521 from albers/changelog-rollover
[Fix 15520] wrong feature description (rollover) in changelog
Upstream-commit: e26ee9a31780f72556a0b7777af44561ff84bbdd
Component: engine
2015-08-13 02:17:42 +02:00
David Calavera
534bcd14d8 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
Alexander Morozov
a6883223e5 Merge pull request #15531 from Microsoft/10662-buildercommands
Windows: Error on unsupported builder command
Upstream-commit: d50d56b35213e7d38437b76af28131a4cf3458d3
Component: engine
2015-08-12 13:13:03 -07:00
Alexander Morozov
187778eec2 Merge pull request #15504 from kolyshkin/zfs-nitpicks
zfs nitpicks
Upstream-commit: d8ff9ef2b5349b111d09d791fcbc81e1d9deab30
Component: engine
2015-08-12 11:54:35 -07:00
Jessie Frazelle
60f12fa9b0 Merge pull request #15446 from cpuguy83/better_err_on_exec_err
Return better errors from exec
Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c
Component: engine
2015-08-12 11:13:29 -07:00
John Howard
0baccb159d Windows: Error on unsupported builder command
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 394ccfac0782d9877b430b5c7ef75374edcb94e8
Component: engine
2015-08-12 10:02:23 -07:00
moxiegirl
8aaf7ef170 Merge pull request #15450 from liubin/liubin/change-port-number-through-example
change port number through example context
Upstream-commit: 8a0efadee14769f39abb0b3c67a2c794dc973443
Component: engine
2015-08-12 09:49:50 -07:00
Jessie Frazelle
427a5313d8 Merge pull request #15183 from jfrazelle/test-install-script
add file to test install script
Upstream-commit: e82358586d62413c598b81df4c2d9af6045ee53d
Component: engine
2015-08-12 09:49:35 -07:00
Harald Albers
bb2fd1f392 Fix wrong feature description (rollover) in changelog
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 967c50cfe919d89c5b526a55f20bbce1c21c9b70
Component: engine
2015-08-12 04:20:16 -07:00
Arnaud Porterie
f4c29d8ab3 Merge pull request #15512 from moxiegirl/fix-links-checker
Fixes after release
Upstream-commit: dc945f5559f14d2a03e67b8e71ff7ec90323b058
Component: engine
2015-08-11 23:15:04 -07:00
Mary Anthony
a3fa37d61e Fixes after release
Adding in a link about the deprecated material
Fixing bad link to staging

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8b09f8a302eaf7d73015112a774010e57e7f2c25
Component: engine
2015-08-11 23:13:14 -07:00
Kir Kolyshkin
baa28c0e1c graphdriver/zfs: fix GetMetadata() comment
Commit e27c904 added a wrong and misleading comment
to GetMetadata(). Fix it using the wording from
commit 407a626 which introduced GetMetadata().

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 15a232fd06e062f8aae4e89e1f520f44c875daeb
Component: engine
2015-08-11 18:16:11 -07:00
Kir Kolyshkin
9192baac2d graphdriver/zfs: privatize mountPath and zfsPath
These functions are not part of the graphdriver.Driver
interface and should therefore be private.

Also, remove comments added by commit e27c904 as they are
* pretty obvious
* no longer required by golint

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: f5f7fee2ecc964314b2a7b910fda71a157c90f16
Component: engine
2015-08-11 18:16:08 -07:00
Alexander Morozov
575411533d Merge pull request #15502 from mrunalp/fixup_comment
Fix incorrect comment
Upstream-commit: f5e2c6f14baf7789a2b8f2fc3b66dba1d4174c91
Component: engine
2015-08-11 16:53:23 -07:00
Mrunal Patel
b585740325 Fix incorrect comment
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: d626f77e36e16911358248af678cc00900a6f5b5
Component: engine
2015-08-11 19:45:23 -04:00
Jessie Frazelle
090c29f3a8 Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
do not keep old debs for experimental
Upstream-commit: 13873e6841367dc5d00f641e9a5eac967e7aa203
Component: engine
2015-08-11 16:35:55 -07:00
Jessica Frazelle
313dca405d fix oracle linux install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0eade329dc1b75424dfc71a110d1848498b3d153
Component: engine
2015-08-11 16:33:14 -07:00
Jessica Frazelle
988c46b306 add file to test install script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 83416f68deb6ff94ffa1803b90bb9a9cd4e2ca78
Component: engine
2015-08-11 16:31:58 -07:00
David Calavera
93f026e522 Merge pull request #15485 from calavera/merge_release_v1.8.0
Bump version to 1.8.0 in master
Upstream-commit: 0e3674d7d0afeb20eddc61c2acfe72db6ef033dc
Component: engine
2015-08-11 13:38:57 -05:00
David Calavera
b12e028813 Bump dev version to 1.9.0-dev
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a09ba62d187d9ea56cc58f757594367686af8981
Component: engine
2015-08-11 10:21:12 -05:00
David Calavera
8b78a09991 Bump version to 1.8.0
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e8736860177be65b2a2f50437d1214026de1384b
Component: engine
2015-08-11 10:20:47 -05:00
David Calavera
b3cd3aa03a Merge pull request #15474 from tonistiigi/network-ui-endpoints-windows
Mark network ui endpoints unix-only
Upstream-commit: 3e596da9eaa38e2f0d2778a896f3d566c96c70eb
Component: engine
2015-08-11 09:32:09 -05:00
Harald Albers
f68b6c3486 Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -07:00
Jessie Frazelle
28939da7a8 Merge pull request #15473 from jfrazelle/minor-cosmetic-change
minor cosmetic change to client output on pull
Upstream-commit: beab255cc02da5e95e30334c1b71348b279fbbfd
Component: engine
2015-08-10 23:20:05 -07:00
Jessica Frazelle
c0287afaeb minor cosmetic change to client output on pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8bd632276069d7057406aa6ea151296cf5bbbd2f
Component: engine
2015-08-10 21:54:03 -07:00
Tonis Tiigi
223b2cba85 Mark network ui endpoints unix-only
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6e3740450d3265546e6992ec4890cfdaa78296e3
Component: engine
2015-08-10 21:49:27 -07:00
Jessie Frazelle
93ea994036 Merge pull request #15459 from jfrazelle/make-windows-cross-compile-static-daemon-work
make windows cross compile static daemon work
Upstream-commit: ca8f24679e4bea9eb6a3899a02252ad991d04624
Component: engine
2015-08-10 17:53:09 -07:00
moxiegirl
10cc4f16e2 Merge pull request #15458 from moxiegirl/remove-registry-v1-14616
Removing references to registry 1.0
Upstream-commit: c4cb55b84f052c1e5d88860128a1117b696af332
Component: engine
2015-08-10 17:44:32 -07:00
Mary Anthony
ad80c7d292 Initial work
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d550d729e14d1a18d00b66a941da5b23b9a61bd3
Component: engine
2015-08-10 17:43:41 -07:00
moxiegirl
f56c2fcb08 Merge pull request #15396 from moxiegirl/my-trust-changes
Docker content trust documentation
Upstream-commit: 1eb10830668f2444141e3acb98a21299339b4ffe
Component: engine
2015-08-10 17:24:06 -07:00
Diogo Monica
a2a72ddf40 Docker content trust documentation
- started from Diogo's work
- updated after discussions with team
- Updating with new key names
- fixing weight
- adding in sandbox
- adding in gliffy for images
- backing out to old names for now
- Copy edit pass
- Entering comments from the content trust team
- Update name of branch and image name
- Removing the last diogo reference
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 753bf40f154853c32dbd46150cfd964773110610
Component: engine
2015-08-10 17:22:11 -07:00
Jessica Frazelle
817f075302 make windows cross compile static daemon work
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e62745922feb580b3687571bb4c52db3de5157f7
Component: engine
2015-08-10 16:16:58 -07:00
moxiegirl
daff91683b Merge pull request #15462 from moxiegirl/add-migrate-windows-15454
Updating new vm name, add migrate, and Windows 10 limitation
Upstream-commit: 4bfbeb80a62a10cb8337dee83aa003fbddda0491
Component: engine
2015-08-10 15:13:08 -07:00
Mary Anthony
2a0dec8002 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e5c160e1d68fa7ed485827a88a577b9fff2077c7
Component: engine
2015-08-10 13:29:08 -07:00
Alexander Morozov
cbeaee68d7 Merge pull request #15422 from kolyshkin/graphtest-fix
graphtest: filter out lost+found dir entry
Upstream-commit: 0bfad28b867a8dc4d20a15c73588672ae861eaab
Component: engine
2015-08-10 12:21:21 -07:00
Tibor Vass
42ff8b25e5 Merge pull request #15452 from albers/completion-storage-driver
Add missing storage drivers to bash completion
Upstream-commit: 4293861c1ebc52f764c8ebfd715dcf47b67c4d9b
Component: engine
2015-08-10 13:25:45 -04:00
Alexander Morozov
7a08f892e2 Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field
devicemapper: fix zero-sized field access
Upstream-commit: 6f89a8ee1ba6b598dc1f76e829d6db6f830cdb8e
Component: engine
2015-08-10 09:16:11 -07:00
Harald Albers
35c003fe05 Add missing storage drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5cee7e81168c5322aba52b65191035e9c6eef376
Component: engine
2015-08-10 08:49:40 -07:00
bin liu
9d87f815bc change port number through example context
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: b0a65f93a5ab2de540825fab43b4d2ec01f22f36
Component: engine
2015-08-10 23:12:03 +08:00
Vincent Batts
48bf8fcaf6 devicemapper: fix zero-sized field access
Fixes: #15279

Due to
7904946eeb
the devices field is dropped.

This solution works on go1.4 and go1.5

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: f83d05c3be3c3bcc84f6fa229504848ee8078321
Component: engine
2015-08-10 11:11:58 -04:00
Brian Goff
2db4446de9 Merge pull request #15445 from hqhq/hq_use_docker_daemon
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
2015-08-10 10:35:19 -04:00
Brian Goff
9ea0204024 Merge pull request #15447 from albers/completion-ps-format
Add `docker ps --format` to bash completion
Upstream-commit: 2231c5161eef1314a03f62bf46e4f02f1139fa5c
Component: engine
2015-08-10 10:31:49 -04:00
Brian Goff
978d8e86f8 Return better errors from exec
Also cleans up some of the API side of exec.
Was writing the header twice (two different headers).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f078f75bf25353720f28f9f1ea180374fe205302
Component: engine
2015-08-10 09:53:19 -04:00
Harald Albers
d12976103a Add docker ps --format to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c465ba7bdef09ddb06176c8a5f6b787c8e03b402
Component: engine
2015-08-10 06:51:14 -07:00
David Calavera
b49d2589a1 Merge pull request #15426 from BenHall/15425-set-e-install-script-fix
Fix install.sh to handle non-zero exit codes when checking lsb_release
Upstream-commit: ba0eba69603e3a000d269c6363a58c5107862193
Component: engine
2015-08-10 08:47:19 -05:00
David Calavera
beef462220 Merge pull request #15437 from calavera/remove_wrong_doc
Remove doc that doesn't apply to Journald.
Upstream-commit: 650d5d5d7a06f4d8bfa0e09b974c4c6351c0af21
Component: engine
2015-08-10 08:44:08 -05:00
David Calavera
bebc8a8c86 Merge pull request #15441 from summershrimp/master
fix typo mistake
Upstream-commit: 5d54f5075180afdea688fa754a3d36ba125b4279
Component: engine
2015-08-10 08:18:09 -05:00
Qiang Huang
8120b4d8fe Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
Yibai Zhang
761dc54167 fix typo mistake
Signed-off-by: Yibai Zhang <xm1994@gmail.com>
Upstream-commit: fa9e54fbf112c44de05a66330fc22303b1681d05
Component: engine
2015-08-10 16:30:48 +08:00
David Calavera
8adfc237c0 Remove doc that doesn't apply to Journald.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1412f29423def166b0d77e162eec867afc56a8c
Component: engine
2015-08-09 22:12:42 -05:00