Sebastiaan van Stijn
e26ee9a317
Merge pull request #15521 from albers/changelog-rollover
...
[Fix 15520] wrong feature description (rollover) in changelog
2015-08-13 02:17:42 +02:00
David Calavera
d50881e446
Merge pull request #15449 from albers/completion-help
...
Remove -h flag from completion and daemon reference
2015-08-12 17:09:51 -07:00
Sebastiaan van Stijn
2c18e1cd05
docs: fix fedora prerequisites heading
...
Fixes the prerequisites heading not being
rendered properly, because of a missing space.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-13 01:29:10 +02:00
John Howard
4393be7100
Windows: Enable NAT port mapping
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 13:17:27 -07:00
Alexander Morozov
d50d56b352
Merge pull request #15531 from Microsoft/10662-buildercommands
...
Windows: Error on unsupported builder command
2015-08-12 13:13:03 -07:00
Alexander Morozov
d8ff9ef2b5
Merge pull request #15504 from kolyshkin/zfs-nitpicks
...
zfs nitpicks
2015-08-12 11:54:35 -07:00
Jessie Frazelle
d3198fa8c4
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
2015-08-12 11:13:29 -07:00
John Howard
394ccfac07
Windows: Error on unsupported builder command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 10:02:23 -07:00
moxiegirl
8a0efadee1
Merge pull request #15450 from liubin/liubin/change-port-number-through-example
...
change port number through example context
2015-08-12 09:49:50 -07:00
Jessie Frazelle
e82358586d
Merge pull request #15183 from jfrazelle/test-install-script
...
add file to test install script
2015-08-12 09:49:35 -07:00
Harald Albers
e4d8a8e1ca
Add storage options to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 06:13:24 -07:00
Julien Bisconti
c7ab9b4a5c
update README.md
...
Add Awesome-docker list to docker resources.
Signed-off-by: Julien Bisconti <julien.bisconti@gmail.com >
2015-08-12 15:10:29 +02:00
Harald Albers
5c1ad6f90c
Add options for the json-file logging driver to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:39:29 -07:00
Harald Albers
644c158837
Update bash completion for docker run
...
Also fixed sort order of options using `sort -d`
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:38:55 -07:00
Harald Albers
967c50cfe9
Fix wrong feature description (rollover) in changelog
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:20:16 -07:00
Harald Albers
b4a89489ae
Fix wrong feature description in changelog
...
See https://github.com/docker/docker/issues/15518
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 03:25:37 -07:00
Arnaud Porterie
dc945f5559
Merge pull request #15512 from moxiegirl/fix-links-checker
...
Fixes after release
2015-08-11 23:15:04 -07:00
Mary Anthony
8b09f8a302
Fixes after release
...
Adding in a link about the deprecated material
Fixing bad link to staging
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-11 23:13:14 -07:00
Kai Blin
a7cfb098d4
reference/run: Clarify the use of numeric UIDs
...
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-12 06:34:37 +02:00
Kir Kolyshkin
15a232fd06
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 >
2015-08-11 18:16:11 -07:00
Kir Kolyshkin
f5f7fee2ec
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 >
2015-08-11 18:16:08 -07:00
Alexander Morozov
f5e2c6f14b
Merge pull request #15502 from mrunalp/fixup_comment
...
Fix incorrect comment
2015-08-11 16:53:23 -07:00
Mrunal Patel
d626f77e36
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-08-11 19:45:23 -04:00
Jessie Frazelle
13873e6841
Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
...
do not keep old debs for experimental
2015-08-11 16:35:55 -07:00
Jessica Frazelle
0eade329dc
fix oracle linux install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:33:14 -07:00
Jessica Frazelle
83416f68de
add file to test install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:31:58 -07:00
Stefan J. Wernli
230cfc6ed2
Fixing Tar functions to support Windows long paths.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-11 16:07:36 -07:00
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
bca8159174
Make the release process more atomic between major releases.
...
Rather than keeping a branch named "release" where we merge every release,
we want to keep "disposable" release branches for each release.
This will make much easier to create new major releases, since we always
want to start these releases from what we have in master. We create a
disposable release branch from master that we'll only use during the lifecycle
of the major release.
Once the release branch is created, the release captain will use a "bump" branch
in her own fork to cherry pick changes that will need to be applied to this
release. We'll track those changes in a pull request between the disposable release
branch and the bump branch.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:09:25 -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
Harald Albers
ceb11d9660
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 >
2015-08-11 07:30:58 -07: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
bin liu
b0a65f93a5
change port number through example context
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-10 23:12:03 +08:00