docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi
626d25a7d9 Tweak hack/make/*-{client,daemon} to be consistent 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-04-25 11:40:36 -07:00
Tibor Vass
e974eadd94 Merge pull request #22303 from kencochrane/fix_integration_daemon_start 
Fixing the PATH in .integration-daemon-start to find dyn docker binary
 2016-04-25 14:39:45 -04:00
Tibor Vass
5611424d82 Merge pull request #22301 from kencochrane/dynbinary-fix 
Change name from docker-client to docker in dynbinary-client
 2016-04-25 14:38:13 -04:00
Alexandre Beslic
2044af6949 Merge pull request #2143 from allencloud/remove-empty-vendor-in-stretchr-testify 
remove empty vendor in stretchr testify
 2016-04-25 11:34:36 -07:00
Alexander Morozov
48f25161be Merge pull request #22230 from justincormack/seccomp_dropcalls 
Remove mlock and vhangup from the default seccomp profile
 2016-04-25 11:27:42 -07:00
Sebastiaan van Stijn
2fae3d2693 skip TestAuthApi if no network is available 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-04-25 20:12:36 +02:00
Nishant Totla
e4bab6cf07 Merge pull request #1942 from allencloud/api-response-status-code-comparison 
add documentation describing the difference in api response status code.
 2016-04-25 10:36:09 -07:00
Sun Hongliang
61e0ccd243 add documentation describing the difference in api response status code. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-26 01:21:23 +08:00
Vincent Demeester
17d5c97c90 Merge pull request #22125 from crosbymichael/restart-timeout 
Reset restart timeout if execution longer than 10s
 2016-04-25 19:15:32 +02:00
Aaron Lehmann
e6df098390 Merge pull request #22254 from yongtang/22244-remote-api-auth-behavior 
Add default `serveraddress` value in remote API `/auth`
 2016-04-25 10:15:08 -07:00
Vincent Demeester
88d1ae148c Merge pull request #22272 from yongtang/22271-relative-symlinks 
Relative symlinks don't work with --device argument
 2016-04-25 18:10:04 +02:00
David Calavera
28b7dc51ae Merge pull request #21583 from allencloud/move-cors-into-common-config 
move cors into common config
 2016-04-25 09:08:38 -07:00
Tibor Vass
bee093802d Merge pull request #22299 from thaJeztah/fix-label-reload 
fix reloading of daemon labels from config
 2016-04-25 12:06:57 -04:00
David Calavera
0843527e86 Merge pull request #22265 from thaJeztah/ohman-ohman 
OHMAN! Move vbatts to alumni
 2016-04-25 09:05:09 -07:00
Doug Davis
d03ba27b76 Merge pull request #22118 from michael-holzheu/22007-s390x-fix-notary-build-for-gcc-v2 
Create "src" symlink for building notary with gcc 5
 2016-04-25 11:50:00 -04:00
Ken Cochrane
5ee737c70c Fixing the PATH in .integration-daemon-start to find dynamic docker binary 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-25 11:18:34 -04:00
Ken Cochrane
f9e03d52e9 Change name from docker-client to docker in dynbinary-client 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-25 10:44:37 -04:00
Yong Tang
632b314b23 Relative symlinks don't work with --device argument 
This fix tries to address the issue raised in #22271 where
relative symlinks don't work with --device argument.

Previously, the symlinks in --device was implemneted (#20684)
with `os.Readlink()` which does not resolve if the linked
target is a relative path. In this fix, `filepath.EvalSymlinks()`
has been used which will reolve correctly with relative
paths.

An additional test case has been added to the existing
`TestRunDeviceSymlink` to cover changes in this fix.

This fix is related to #13840 and #20684, #22271.
This fix fixes #22271.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-04-25 07:22:56 -07:00
Sebastiaan van Stijn
e8708f3049 Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info 
Fix insecure registries upppercase in docker info
 2016-04-25 16:21:04 +02:00
Sebastiaan van Stijn
455858fc70 fix reloading of daemon labels from config 
commit 20a038eca6 changed
daemon configuration reloading to check if a value
was actually set, however, it checked for the wrong
property ("label" instead of "labels"), which resulted
in the labels only to be loaded from daemon.json if both
a "label" -and- a "labels" property was present.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-04-25 15:57:28 +02:00
Lorenzo Fontana
96cc1ee44c Mention the fact that authz plugins are available today 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2016-04-25 15:31:23 +02:00
Lei Jitang
66eb91463a Merge pull request #22287 from hqhq/hq_add_blk_check 
Add CONFIG_CFQ_GROUP_IOSCHED check
 2016-04-25 20:15:31 +08:00
allencloud
e78884dafd make Insecure registries uppercase like other keys in docker info 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-04-25 18:44:34 +08:00
Qiang Huang
192387198d Add CONFIG_CFQ_GROUP_IOSCHED check 
blkio.weight depends on this config.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-04-25 14:08:29 +08:00
allencloud
2feb88cbd3 1.move cors into common config 
2.windows can use cors, too
3.remove function setPlatformServerConfig

Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-04-25 10:52:13 +08:00
Alexandre Beslic
0524ead8da Merge pull request #2160 from nishanttotla/fix-typo-contributing 
Fix typo in CONTRIBUTING.md
 2016-04-24 16:04:40 -07:00
John Starks
4677f8036e Windows: Add file version information 
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-24 10:55:51 -07:00
Tibor Vass
1e9b2355e4 Merge pull request #22184 from yongtang/22036-label-set 
Labels set on the command line don't override labels in Dockerfile
 2016-04-24 08:37:00 -04:00
Vincent Demeester
4e5ad97f5b Merge pull request #22138 from wenchma/deprecated_since_before 
Deprecated of docker ps since and before options for v1.12
 2016-04-24 11:23:21 +02:00
Sun Hongliang
fa8b2737a1 remove empty vendor in stretchr testify 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-24 14:55:56 +08:00
Nishant Totla
95f495b589 Fix typo in CONTRIBUTING.md 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-23 20:10:59 -07:00
Yong Tang
5844736c14 Labels set on the command line always override labels in Dockerfile 
This fix tries to address the inconsistency in #22036 where labels
set on the command line will not override labels specified in
Dockerfile, but will override labels inherited from `FROM` images.

The fix add a LABEL with command line options at the end of the
processed Dockerfile so that command line options labels always
override the LABEL in Dockerfiles (or through `FROM`).

An integration test has been added for test cases specified in #22036.

This fix fixes #22036.

NOTE: Some changes are from #22266 (@tiborvass).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-04-23 18:49:17 -07:00
John Howard
35963cae80 Merge pull request #22274 from tiborvass/fix-tgz-binary-split 
Add dockerd daemon binary to tgz and zip archives
 2016-04-23 16:54:00 -07:00
Tibor Vass
44ff216985 Add dockerd daemon binary to tgz and zip archives 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-23 18:26:05 -04:00
Anis Elleuch
987faca8a6 Sorting completed parts by part number for a better accordance with the S3 spec 
Signed-off-by: Anis Elleuch <vadmeste@gmail.com>
 2016-04-23 22:36:04 +01:00
John Howard
27f44b8af6 Merge pull request #20639 from dnephin/split_client 
Split the binary into two: client and daemon
 2016-04-23 14:14:20 -07:00
Nishant Totla
a8c8eb8080 Merge pull request #2159 from allencloud/fix-and-format-changelog 
fix some typos and format CHANGELOG.md
 2016-04-23 12:55:27 -07:00
Daniel Nephin
c0acfccc7b Cleanup from CR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-23 15:05:15 -04:00
Sebastiaan van Stijn
7a2a8344e3 Merge pull request #22128 from FWirtz/master 
Removed the outdated Node.js documentation as requested
 2016-04-23 16:05:32 +02:00
Florian
d9c0d67b51 Remove outdated Node.js example - include a link to the new guide later! 
As recommended by @moxiegirl and squashed.

Signed-off-by: FWirtz <florian.wirtz08@gmail.com>
 2016-04-23 14:10:24 +02:00
Antonio Murdaca
885e5eb5f7 Merge pull request #22256 from mlaventure/use-abs-rootfs-path 
Use absolute path for rootfs in OCI config.json
 2016-04-23 13:21:21 +02:00
Antonio Murdaca
b2926152d0 Merge pull request #22255 from crosbymichael/containerd-bump 
Bump containerd to v0.2.1
 2016-04-23 12:28:01 +02:00
Sun Hongliang
933ae477b6 fix some typos and format CHANGELOG.md 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-23 17:00:20 +08:00
Victor Vieux
c882e5e5a7 rollback to Go 1.5.4 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-23 01:50:10 -07:00
Dongluo Chen
584e10c9f9 Merge pull request #2158 from dongluochen/bump-1.2.1rc1 
bump 1.2.1-rc1
 2016-04-22 22:07:54 -07:00
Dongluo Chen
bf9e985d5b Merge pull request #2132 from nishanttotla/image-ops-engine-api 
Moving last few image operations to engine-api
 2016-04-22 22:05:02 -07:00
Yong Tang
93973196f4 Add default serveraddress value in remote API /auth 
This fix tries to address the issue in #22244 where the remote
API `/auth` will not set the default value of `serveraddress`
if not provided. This behavior happens after only in 1.11.0
and is a regression as in 1.10.3 `serveraddress` will be assigned
with `IndexServer` if no value is provided.

The default value `IndexServer` is assigned to `serveraddress` if
no value provided in this fix.

An integration test `TestAuthApi` has been added to cover this change

This fix fixes #22244.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-04-22 20:00:47 -07:00
Serge Dubrouski
21f38a74e6 Add blobWrtiter.Close() call into blobWriter.Commit() 
Signed-off-by: Serge Dubrouski <sergeyfd@gmail.com>
 2016-04-22 19:23:17 -06:00
Dong Chen
7cca0cbcde Bump 1.2.1-rc1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-22 17:57:33 -07:00
Joao Fernandes
f419221366 Cleans docs, fixes typos 2016-04-22 17:14:38 -07:00