Commit Graph

17604 Commits

Author SHA1 Message Date
Tobias Gesellchen 9bde19e72a skip checkOrigin during websocket handshake
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-08-12 00:05:59 +02:00
David Calavera 0e3674d7d0 Merge pull request #15485 from calavera/merge_release_v1.8.0
Bump version to 1.8.0 in master
2015-08-11 13:38:57 -05:00
David Calavera a09ba62d18 Bump dev version to 1.9.0-dev
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-11 10:21:12 -05:00
David Calavera e873686017 Bump version to 1.8.0
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-11 10:20:47 -05:00
David Calavera 3e596da9ea Merge pull request #15474 from tonistiigi/network-ui-endpoints-windows
Mark network ui endpoints unix-only
2015-08-11 09:32:09 -05:00
Jessie Frazelle beab255cc0 Merge pull request #15473 from jfrazelle/minor-cosmetic-change
minor cosmetic change to client output on pull
2015-08-10 23:20:05 -07:00
Jessica Frazelle 8bd6322760 minor cosmetic change to client output on pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-10 21:54:03 -07:00
Tonis Tiigi 6e3740450d Mark network ui endpoints unix-only
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-10 21:49:27 -07:00
Jessie Frazelle ca8f24679e Merge pull request #15459 from jfrazelle/make-windows-cross-compile-static-daemon-work
make windows cross compile static daemon work
2015-08-10 17:53:09 -07:00
moxiegirl c4cb55b84f Merge pull request #15458 from moxiegirl/remove-registry-v1-14616
Removing references to registry 1.0
2015-08-10 17:44:32 -07:00
Mary Anthony d550d729e1 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>
2015-08-10 17:43:41 -07:00
moxiegirl 1eb1083066 Merge pull request #15396 from moxiegirl/my-trust-changes
Docker content trust documentation
2015-08-10 17:24:06 -07:00
Diogo Monica 753bf40f15 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>
2015-08-10 17:22:11 -07:00
Jessica Frazelle e62745922f make windows cross compile static daemon work
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-10 16:16:58 -07:00
moxiegirl 4bfbeb80a6 Merge pull request #15462 from moxiegirl/add-migrate-windows-15454
Updating new vm name, add migrate, and Windows 10 limitation
2015-08-10 15:13:08 -07:00
Mary Anthony e5c160e1d6 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-10 13:29:08 -07:00
Alexander Morozov 0bfad28b86 Merge pull request #15422 from kolyshkin/graphtest-fix
graphtest: filter out lost+found dir entry
2015-08-10 12:21:21 -07:00
Tibor Vass 4293861c1e Merge pull request #15452 from albers/completion-storage-driver
Add missing storage drivers to bash completion
2015-08-10 13:25:45 -04:00
Alexander Morozov 6f89a8ee1b Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field
devicemapper: fix zero-sized field access
2015-08-10 09:16:11 -07:00
Harald Albers 5cee7e8116 Add missing storage drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-10 08:49:40 -07:00
Vincent Batts f83d05c3be 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>
2015-08-10 11:11:58 -04:00
Brian Goff 51249a3aa0 Merge pull request #15445 from hqhq/hq_use_docker_daemon
Change all docker -d to docker daemon
2015-08-10 10:35:19 -04:00
Brian Goff 2231c5161e Merge pull request #15447 from albers/completion-ps-format
Add `docker ps --format` to bash completion
2015-08-10 10:31:49 -04:00
Harald Albers c465ba7bde Add `docker ps --format` to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-10 06:51:14 -07:00
David Calavera ba0eba6960 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
2015-08-10 08:47:19 -05:00
David Calavera 650d5d5d7a Merge pull request #15437 from calavera/remove_wrong_doc
Remove doc that doesn't apply to Journald.
2015-08-10 08:44:08 -05:00
David Calavera 5d54f50751 Merge pull request #15441 from summershrimp/master
fix typo mistake
2015-08-10 08:18:09 -05:00
Qiang Huang 81cc8ebc93 Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-10 20:48:08 +08:00
Yibai Zhang fa9e54fbf1 fix typo mistake
Signed-off-by: Yibai Zhang <xm1994@gmail.com>
2015-08-10 16:30:48 +08:00
David Calavera f1412f2942 Remove doc that doesn't apply to Journald.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-09 22:12:42 -05:00
moxiegirl b173314cca Merge pull request #15400 from vincentbernat/doc/memory-cgroup-overhead
doc: add a notice about memory accounting overhead
2015-08-09 16:38:41 -07:00
Sebastiaan van Stijn 8e05a3e30f Merge pull request #15411 from moxiegirl/fix-links-15349
Fixes #15349 too many apis
2015-08-09 20:52:49 +02:00
Kir Kolyshkin 158c536267 graphtest: filter out lost+found dir entry
Ploop graph driver provides its own ext4 filesystem to every
container. It so happens that ext4 root comes with lost+found
directory, causing failures from DriverTestCreateEmpty() and
DriverTestCreateBase() tests on ploop.

While I am not yet ready to submit ploop graph driver for review,
this change looks simple enough to push.

Note that filtering is done without any additional allocations,
as described in https://github.com/golang/go/wiki/SliceTricks.

[v2: added a comment about lost+found]

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
2015-08-09 10:23:36 -07:00
moxiegirl 98ec623a8b Merge pull request #15431 from charleswhchan/patch-4
Cleanup "Automatically start containers" page.
2015-08-09 10:10:42 -07:00
Charles Chan ad3df49958 Cleanup "Automatically start containers" page.
* Remove old information for Docker 1.2. (See PR #15408)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-08 17:28:21 -07:00
Doug Davis 34a17a5de1 Merge pull request #15427 from calavera/fix_overlay_typo
Fix typo in Overlay documentation.
2015-08-08 18:14:38 -04:00
David Calavera f1f6738d97 Fix typo in Overlay documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-08 15:11:09 -07:00
moxiegirl 00843d18d8 Merge pull request #15312 from yyekhlef/fedora_22_doc
Fedora 22 manual network configuration and ip forwarding
2015-08-08 12:59:11 -07:00
moxiegirl 030df72279 Merge pull request #15408 from ankushagarwal/env-var-docs
Make Environment replacement note less kludgy
2015-08-08 12:56:19 -07:00
moxiegirl 22d539866c Merge pull request #15409 from ankushagarwal/wgetcurl
Make official install instructions use curl instead of wget
2015-08-08 12:51:48 -07:00
Brian Goff cc73fc03e8 Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
Truncating image id is docker ps to a length of 12
2015-08-08 07:48:16 -04:00
Brian Goff 764aa1a583 Merge pull request #15074 from coolljt0725/14756_enable_golint_2
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
2015-08-08 07:14:53 -04:00
Ben Hall 3b28bada0a Fix install.sh to handle non-zero exit codes when checking lsb_release
Signed-off-by: Ben Hall <ben@benhall.me.uk>
2015-08-08 11:44:52 +01:00
Arnaud Porterie bf892dcfcc Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
Arnaud Porterie 46f40c34d2 Merge pull request #15424 from coolljt0725/typo_remove_useless_period
Typo: remove unconsistent period in docker info
2015-08-08 01:04:38 -07:00
Lei Jitang dc2a7ab750 Typo: remove unconsistent period in docker info
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 13:06:59 +08:00
Alexander Morozov 03f969d0b3 Merge pull request #15423 from HuKeping/if-else
Remove useless if-else
2015-08-07 21:54:30 -07:00
Hu Keping c536cec5ea Remove useless if-else
It is better to use simple form without else.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-08-08 20:02:44 +08:00
Lei Jitang 5220f3b535 Enable golint in pkg/jsonlog and pkg/jsonmessage.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 11:28:22 +08:00
David Calavera 196aa6d62d Merge pull request #14965 from stefanberger/nohidevols2
Have network files mounted read-only when -v parameter has 'ro' passed
2015-08-07 19:10:59 -07:00