Commit graph

28427 commits

Author SHA1 Message Date
Nikolay Milovanov
b222aa1a58 Adding the hostname option to docker service command
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
2016-11-03 10:02:14 +00:00
Vincent Demeester
19b5b4aada Merge pull request #27951 from LK4D4/dump_always_to_file
daemon: always dump stack to file
2016-11-03 00:35:06 -07:00
Vincent Demeester
0f9ba0ea70 Merge pull request #28016 from thaJeztah/dont-include-powershell-in-tgz
Don't include PowerShell completions in tgz
2016-11-02 23:32:48 -07:00
Vincent Demeester
1f4137857f Merge pull request #28006 from dmcgowan/clean-overlay2-layerstore
Cleanup invalid code in overlay2 and layer store
2016-11-02 23:16:38 -07:00
Vincent Demeester
5c9e38b73f Merge pull request #27889 from Microsoft/jjh/windockerfile
Windows: dockerfile tweaks
2016-11-02 23:08:27 -07:00
Vincent Demeester
9a6f26ce55 Merge pull request #27973 from yuexiao-wang/add-stack
Add stack service and fix typos
2016-11-02 23:04:54 -07:00
yuexiao-wang
0a56e81ca4 Add stack service and fix typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-03 19:21:27 +08:00
Sebastiaan van Stijn
1be4b0e0cc
Don't include PowerShell completions in tgz
The PowerShell completion script was outdated,
and removed from this repository in
65fdbf0210.

A more up to date implementation can be found
here; https://github.com/samneirinck/posh-docker

Removing this script from the tgz

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-02 21:51:58 -07:00
Brian Goff
877c860428 Merge pull request #27849 from miaoyq/clean-up-redundant-constants
Clean up the constants in 'libcontainerd' that are no longer in use
2016-11-02 23:01:59 -04:00
John Howard
cb352501af Merge pull request #27963 from darrenstahlmsft/RenameDelete
Windows: Rename layers before deletion
2016-11-02 19:20:39 -07:00
Sebastiaan van Stijn
11605903d0 Merge pull request #27746 from Microsoft/jjh/pscompletion
Redirect powershell completion
2016-11-02 19:08:38 -07:00
Sebastiaan van Stijn
a1a93f631f Merge pull request #28007 from justincormack/check-config-error
Make the check-config script return success or failure
2016-11-02 18:23:59 -07:00
Brian Goff
666377b23e Merge pull request #27986 from milindchawre/fix_21803
Fixes #21803 : Removing unused configuration in daemon/logger/fluentd
2016-11-02 21:03:15 -04:00
Sebastiaan van Stijn
d83f56ee5f Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
add replicated in service scale command description
2016-11-02 18:01:59 -07:00
Justin Cormack
6d116ffbbb Make the check-config script return success or failure
Although primarily a human readable script, it is quite useful
to return success or failure from this script so it can be used
as a basic test.

Fail if any check fails, including some that are optional,
other than the storage driver tests, where only one needs to
succeed, so the system has at least one workable storage driver.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-02 23:23:52 +00:00
Derek McGowan
6622cc970e
Cleanup invalid code in overlay2 and layer store
The overlay2 change ensures that the correct path is used to resolve the
symlink. The current code will not fail since the symlinks are always given
a value of "../id/diff" which ends up ignoring the incorrect "link" value.
Fix this code so it doesn't cause unexpected errors in the future if the
symlink changes.

The layerstore cleanup ensures that the empty layer returns a tar stream if
the provided parent is empty. Any value other than empty still returns an
error since the empty layer has no parent. Currently empty layer is not
used anywhere that TarStreamFrom is used but could break in the future if
this function is called.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-02 16:13:53 -07:00
Sebastiaan van Stijn
ed1d57c5f9 Merge pull request #27838 from dperny/swarm_support_npipe
Support Windows Named Pipe for Swarm Mode
2016-11-02 16:00:38 -07:00
Misty Stanley-Jones
8f6fd3687d Merge pull request #27999 from gdevillele/fix_frontmatter_keywords
fix frontmatter in reference md files
2016-11-02 15:00:40 -07:00
Victor Vieux
42ef2bd4fe Merge pull request #27990 from crosbymichael/grimes-11-2
Update init to fe069a03affd2547fdb05e5b8b07202d2e4
2016-11-02 14:27:31 -07:00
Gaetan de Villele
8d61e36edc fix frontmatter in reference md files
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-02 14:23:27 -07:00
Tibor Vass
1e51f99684 Merge pull request #27918 from dmcgowan/use-system-certs
Merge system certificate pool with custom certificates
2016-11-02 13:51:58 -07:00
Drew Erny
5b6c565f74 use named pipe on windows
Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-11-02 13:47:35 -07:00
Anusha Ragunathan
4a955dc4d4 Merge pull request #27914 from riyazdf/check-plugins-on-startup
Check authz plugins on daemon startup, add v2 integration tests
2016-11-02 13:38:32 -07:00
Vincent Demeester
5e5c7d5216 Merge pull request #27980 from allencloud/change-description-in-node-rm-force-flag
node rm can be applied on not only active node
2016-11-02 13:35:48 -07:00
Alexander Morozov
197befe047 Merge pull request #27995 from vdemeester/vendor-swarmkit-for-templating
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
2016-11-02 13:32:13 -07:00
Tibor Vass
ecd806cdf1 Merge pull request #27991 from Microsoft/jjh/testapiclientversionoldnotsupported
Fix TestAPIClientVersionOldNotSupported
2016-11-02 13:10:04 -07:00
Vincent Demeester
cff3cdd35a
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-02 19:43:27 +01:00
Michael Crosby
d0d0f982f9 Merge pull request #27989 from dnephin/fix-swagger-gen
Fix swagger-gen
2016-11-02 11:40:12 -07:00
Alexander Morozov
e5d36586ac daemon: always dump stack to file
Dumping to log is unusable in 90% of cases and inspecting file is much
more convenient.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-02 11:22:43 -07:00
Kenfe-Mickaël Laventure
fae5a9e053 Merge pull request #27962 from epeterso/patch-2
remove world/group writable perms
2016-11-02 11:22:40 -07:00
Riyaz Faizullabhoy
2b045027ce Check authz plugins are valid on daemon startup, add integration tests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-11-02 11:20:54 -07:00
Justin Cormack
b06f25496d Merge pull request #27835 from tophj-ibm/update-install-script-for-p-and-z
Fix install script for multiarch
2016-11-02 17:14:24 +00:00
John Howard
29d21388d5 Fix TestAPIClientVersionOldNotSupported
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-02 09:43:29 -07:00
Michael Crosby
131514dad6 Update init to fe069a03affd2547fdb05e5b8b07202d2e4
diff:

```patch
diff --git a/Makefile b/Makefile
index 0b2b063..70df01b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+GIT_VERSION := $(shell git describe --abbrev=40 --long --dirty --always --tags)

 all:
-	gcc -O2 -o init -static grimes.c
+	gcc -O2 -DVERSION=\"$(GIT_VERSION)\" -o init -static grimes.c
diff --git a/grimes.c b/grimes.c
index d0f836b..ffeea98 100644
--- a/grimes.c
+++ b/grimes.c
@@ -29,7 +29,7 @@ typedef struct reaper_t {
 } reaper_t;

 // reaper_new initializes the reaper with the provided process.
-// it also sets up the signal handlers and child handlers for restore
+// it also sets up the signal handlers and child handlers for restore
 // when the child is execed
 int reaper_new(reaper_t * reaper, process_t * process)
 {
@@ -57,7 +57,7 @@ int reaper_new(reaper_t * reaper, process_t * process)
 	return 0;
 }

-// reaper_exit closes the reaper's signalfd and exits with the
+// reaper_exit closes the reaper's signalfd and exits with the
 // child's exit status
 void reaper_exit(reaper_t * reaper, int status)
 {
@@ -68,11 +68,11 @@ void reaper_exit(reaper_t * reaper, int status)
 	exit(WEXITSTATUS(status));
 }

-// reaper_reap reaps any dead processes.  If the process that is reaped
+// reaper_reap reaps any dead processes.  If the process that is reaped
 // is the child process that we spawned get its exit status and exit this program
 int reaper_reap(reaper_t * reaper)
 {
-	int status, child_exited, child_status = 0;
+	int status = 0, child_exited = 0, child_status = 0;
 	for (;;) {
 		pid_t pid = waitpid(-1, &status, WNOHANG);
 		switch (pid) {
@@ -140,6 +140,12 @@ int main(int argc, char **argv)
 {
 	process_t process;
 	reaper_t reaper;
+
+	if (argc == 2 && !strcmp(argv[1], "--version")) {
+		printf("grimes version %s\n", VERSION);
+		exit(0);
+	}
+
 	if (reaper_new(&reaper, &process) != 0) {
 		bail("initialize reaper %s", strerror(errno));
 	}

```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-02 09:27:54 -07:00
Daniel Nephin
252963bd3f Fix swagger-gen.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-02 10:48:34 -04:00
Alexander Morozov
78a83a2269 Merge pull request #27932 from thaJeztah/promote-overlay
promote overlay(2) graphdriver
2016-11-02 07:00:49 -07:00
Akihiro Suda
e448a32192 Merge pull request #27974 from yongtang/27969-duplicate-bind-mount
Fix issue related to duplicate identical bind mounts for `docker run`
2016-11-02 20:26:25 +09:00
milindchawre
3463bbcc71 Fixes #21803 : Removing unused configuration in daemon/logger/fluentd
Signed-off-by: milindchawre <milindchawre@gmail.com>
2016-11-02 11:11:02 +00:00
Vincent Demeester
ebf10dc5b0 Merge pull request #27883 from mavenugo/na
Copy only the relevant endpoint configs from Attachable config
2016-11-02 11:50:31 +01:00
allencloud
002262d6f5 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 17:22:04 +08:00
Vincent Demeester
6740bc5895 Merge pull request #27965 from dmcgowan/remove-rw-tar-stream-from
Remove TarStreamFrom from RWLayer interface
2016-11-02 10:18:20 +01:00
Vincent Demeester
bcdce2a6b0 Merge pull request #27705 from dmcgowan/fix-27298
Ensure opaque directory permissions respected
2016-11-02 10:13:30 +01:00
allencloud
b9fdbbad61 add replicated in service scale command description
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn
f96d45dc8a Merge pull request #27948 from WeiZhang555/consistent-filters
Replace all "Filter" field with "Filters" for consistency
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
85da2562f4 Merge pull request #27862 from crosbymichael/metrics-docs
Add metrics docs to cli reference
2016-11-02 00:41:14 -07:00
Vincent Demeester
68a981105f Merge pull request #27848 from hqhq/remove_armhf_in_aarch64
Remove legacy armhf things in aarch64 Dockerfile
2016-11-02 08:09:59 +01:00
Sebastiaan van Stijn
d1fe79ca84 Merge pull request #27869 from bltavares/nuke-when-graphdir-is-a-mount
Nuke when graphdir is a mount
2016-11-01 23:21:49 -07:00
Sebastiaan van Stijn
2c43762cf2 Merge pull request #27942 from yuexiao-wang/remove-const
Remove some redundant consts
2016-11-01 20:43:50 -07:00
yuexiao-wang
6b412d4fd3 Remove some redundant consts
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn
b998088145 Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
Add StatsFormat to the config.json file
2016-11-01 20:32:13 -07:00