toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,420 Commits 3 Branches 295 Tags
a35b88e218b9173c4ab9ee0740260cc5c8766300
Commit Graph
28420 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester a35b88e218 Merge pull request #27889 from Microsoft/jjh/windockerfile 
Windows: dockerfile tweaks
Upstream-commit: 5c9e38b73f4f5b6f2984436f6defd74a1eea9c9c
Component: engine
 2016-11-02 23:08:27 -07:00
Vincent Demeester 8c2f0234f4 Merge pull request #27973 from yuexiao-wang/add-stack 
Add stack service and fix typos
Upstream-commit: 9a6f26ce551dd4b6a76d060675f2ceb97db4680b
Component: engine
 2016-11-02 23:04:54 -07:00
yuexiao-wang 5f56134046 Add stack service and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0a56e81ca4d7af22e5c623569a89d800a6778ed1
Component: engine
 2016-11-03 19:21:27 +08:00
Brian Goff 42774a8628 Merge pull request #27849 from miaoyq/clean-up-redundant-constants 
Clean up the constants in 'libcontainerd' that are no longer in use
Upstream-commit: 877c86042885feb3b773f215817ab5447aa1468a
Component: engine
 2016-11-02 23:01:59 -04:00
John Howard 184a08cc1e Merge pull request #27963 from darrenstahlmsft/RenameDelete 
Windows: Rename layers before deletion
Upstream-commit: cb352501af9e59f10f58846d4154c76726530753
Component: engine
 2016-11-02 19:20:39 -07:00
Sebastiaan van Stijn de4a768f1f Merge pull request #27746 from Microsoft/jjh/pscompletion 
Redirect powershell completion
Upstream-commit: 11605903d0a0126c8b712a9d4cda2614622e0f48
Component: engine
 2016-11-02 19:08:38 -07:00
Sebastiaan van Stijn 5fae8682b8 Merge pull request #28007 from justincormack/check-config-error 
Make the check-config script return success or failure
Upstream-commit: a1a93f631f06a495674f93e2572098a900aa093b
Component: engine
 2016-11-02 18:23:59 -07:00
Brian Goff f083ff7a7d Merge pull request #27986 from milindchawre/fix_21803 
Fixes #21803 : Removing unused configuration in daemon/logger/fluentd
Upstream-commit: 666377b23e6da4793ebbc8ccbe084ddc599ca8d1
Component: engine
 2016-11-02 21:03:15 -04:00
Sebastiaan van Stijn 1364d97991 Merge pull request #27979 from allencloud/more-specific-in-service-scale-description 
add replicated in service scale command description
Upstream-commit: d83f56ee5fa6e398a4205a6d4d32feda560df120
Component: engine
 2016-11-02 18:01:59 -07:00
Justin Cormack 74c006a5ce 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>
Upstream-commit: 6d116ffbbbc597994855f1b6fe86af324ac649de
Component: engine
 2016-11-02 23:23:52 +00:00
Sebastiaan van Stijn 8904258447 Merge pull request #27838 from dperny/swarm_support_npipe 
Support Windows Named Pipe for Swarm Mode
Upstream-commit: ed1d57c5f9a24c6172f5a782868cdf90fee0dc6c
Component: engine
 2016-11-02 16:00:38 -07:00
Misty Stanley-Jones bbfe527f95 Merge pull request #27999 from gdevillele/fix_frontmatter_keywords 
fix frontmatter in reference md files
Upstream-commit: 8f6fd3687d6114d019a36c509184d73370eacbd2
Component: engine
 2016-11-02 15:00:40 -07:00
Victor Vieux 5ca818f32c Merge pull request #27990 from crosbymichael/grimes-11-2 
Update init to fe069a03affd2547fdb05e5b8b07202d2e4
Upstream-commit: 42ef2bd4fea4d79eb584620d35f8646caa52ecdd
Component: engine
 2016-11-02 14:27:31 -07:00
Gaetan de Villele 1045ce080e fix frontmatter in reference md files 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 8d61e36edc8406a17420e2d8cf76d2471d3c5236
Component: engine
 2016-11-02 14:23:27 -07:00
Tibor Vass 018c388beb Merge pull request #27918 from dmcgowan/use-system-certs 
Merge system certificate pool with custom certificates
Upstream-commit: 1e51f99684be5aa4af52719f95e5870489c8658f
Component: engine
 2016-11-02 13:51:58 -07:00
Drew Erny 4399a05e84 use named pipe on windows 
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 5b6c565f74731201f7a03163516048f454e9e9d5
Component: engine
 2016-11-02 13:47:35 -07:00
Anusha Ragunathan 48c9662bdf Merge pull request #27914 from riyazdf/check-plugins-on-startup 
Check authz plugins on daemon startup, add v2 integration tests
Upstream-commit: 4a955dc4d476dd709037805492e7e8e8f10089f9
Component: engine
 2016-11-02 13:38:32 -07:00
Vincent Demeester 9d6b097c5c Merge pull request #27980 from allencloud/change-description-in-node-rm-force-flag 
node rm can be applied on not only active node
Upstream-commit: 5e5c7d521669015aecb3b1880f106f700414dfd5
Component: engine
 2016-11-02 13:35:48 -07:00
Alexander Morozov 05154c1d45 Merge pull request #27995 from vdemeester/vendor-swarmkit-for-templating 
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
Upstream-commit: 197befe047e409bdcd612a517ac687569f5748ac
Component: engine
 2016-11-02 13:32:13 -07:00
Tibor Vass 7db9c8b80c Merge pull request #27991 from Microsoft/jjh/testapiclientversionoldnotsupported 
Fix TestAPIClientVersionOldNotSupported
Upstream-commit: ecd806cdf1360155ee20bf7279b668346475bec7
Component: engine
 2016-11-02 13:10:04 -07:00
Vincent Demeester e717ff6f92 Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cff3cdd35a85e01f18851ecf86b2ae4b6a867cc7
Component: engine
 2016-11-02 19:43:27 +01:00
Michael Crosby 1e794586e4 Merge pull request #27989 from dnephin/fix-swagger-gen 
Fix swagger-gen
Upstream-commit: d0d0f982f9d43e1d14d098b4cfd27c7c926638b2
Component: engine
 2016-11-02 11:40:12 -07:00
Kenfe-Mickaël Laventure 26128eb43e Merge pull request #27962 from epeterso/patch-2 
remove world/group writable perms
Upstream-commit: fae5a9e053ad06bea0429babae2507762d8cc1de
Component: engine
 2016-11-02 11:22:40 -07:00
Riyaz Faizullabhoy 3b23b168fa Check authz plugins are valid on daemon startup, add integration tests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 2b045027ce32a8f938c83adcf5960f1bffdb3f8f
Component: engine
 2016-11-02 11:20:54 -07:00
Justin Cormack 41532969c9 Merge pull request #27835 from tophj-ibm/update-install-script-for-p-and-z 
Fix install script for multiarch
Upstream-commit: b06f25496d803efa2177cd7e89d660f37b295a19
Component: engine
 2016-11-02 17:14:24 +00:00
John Howard 73b83984cb Fix TestAPIClientVersionOldNotSupported 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 29d21388d5119d12a7433a32914bf96d916afdf5
Component: engine
 2016-11-02 09:43:29 -07:00
Michael Crosby c05bbc9c5f 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>
Upstream-commit: 131514dad67be6c8dce6098c219597839aa995d6
Component: engine
 2016-11-02 09:27:54 -07:00
Daniel Nephin b95b382b85 Fix swagger-gen. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 252963bd3fe14e5e89b9e19f29e2936253d35fcf
Component: engine
 2016-11-02 10:48:34 -04:00
Alexander Morozov 0e01981fe9 Merge pull request #27932 from thaJeztah/promote-overlay 
promote overlay(2) graphdriver
Upstream-commit: 78a83a22699198b31c8cbdace3a73c8502f99ba1
Component: engine
 2016-11-02 07:00:49 -07:00
Akihiro Suda 7a2e0e404b Merge pull request #27974 from yongtang/27969-duplicate-bind-mount 
Fix issue related to duplicate identical bind mounts for `docker run`
Upstream-commit: e448a32192f85f084652b3f0d96a3e59d4d63035
Component: engine
 2016-11-02 20:26:25 +09:00
milindchawre a99c149057 Fixes #21803 : Removing unused configuration in daemon/logger/fluentd 
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: 3463bbcc710ce56a8d2ace1e2a2aaaf22db3a516
Component: engine
 2016-11-02 11:11:02 +00:00
Vincent Demeester 7051bd85ce Merge pull request #27883 from mavenugo/na 
Copy only the relevant endpoint configs from Attachable config
Upstream-commit: ebf10dc5b01dabaa3bcbb75f40683aa0432ec1e2
Component: engine
 2016-11-02 11:50:31 +01:00
allencloud 3e5ee94d25 node rm can be applied on not only active node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 002262d6f5d9d88b690124b3743db6856fe4f599
Component: engine
 2016-11-02 17:22:04 +08:00
Vincent Demeester 0e5f9bc87e Merge pull request #27965 from dmcgowan/remove-rw-tar-stream-from 
Remove TarStreamFrom from RWLayer interface
Upstream-commit: 6740bc58950ab97da0fe1e60c46514561197c8aa
Component: engine
 2016-11-02 10:18:20 +01:00
Vincent Demeester fd88171dba Merge pull request #27705 from dmcgowan/fix-27298 
Ensure opaque directory permissions respected
Upstream-commit: bcdce2a6b0d52a18b4eb4a2cb7710b248be88e51
Component: engine
 2016-11-02 10:13:30 +01:00
allencloud 1195e5e7b8 add replicated in service scale command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b9fdbbad6139e6dac5850e82bb67781f467e77c8
Component: engine
 2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn 50046511ff Merge pull request #27948 from WeiZhang555/consistent-filters 
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: f96d45dc8ac21db1f082230e2f828a86e15cad46
Component: engine
 2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn fcd5f70ab1 Merge pull request #27862 from crosbymichael/metrics-docs 
Add metrics docs to cli reference
Upstream-commit: 85da2562f46491a51dda2bc804e2016a54cef6bf
Component: engine
 2016-11-02 00:41:14 -07:00
Vincent Demeester cc06ee6ad8 Merge pull request #27848 from hqhq/remove_armhf_in_aarch64 
Remove legacy armhf things in aarch64 Dockerfile
Upstream-commit: 68a981105fa1b4231ad5735ad758f87adf3bdb67
Component: engine
 2016-11-02 08:09:59 +01:00
Sebastiaan van Stijn 2fdd11175c Merge pull request #27869 from bltavares/nuke-when-graphdir-is-a-mount 
Nuke when graphdir is a mount
Upstream-commit: d1fe79ca84487b679d8e860e971ab82a3cc2dacf
Component: engine
 2016-11-01 23:21:49 -07:00
Sebastiaan van Stijn bc07595486 Merge pull request #27942 from yuexiao-wang/remove-const 
Remove some redundant consts
Upstream-commit: 2c43762cf2a33d9782c1a87ebf2469fc138a5c6b
Component: engine
 2016-11-01 20:43:50 -07:00
yuexiao-wang 457e448f9f Remove some redundant consts 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6b412d4fd30afe2a24f66839a6c26fbc94b01493
Component: engine
 2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn ed695b371e Merge pull request #27864 from vdemeester/add-statsformat-to-configfile 
Add StatsFormat to the config.json file
Upstream-commit: b998088145c1e7b6a2814a3dcb0f68855ae17123
Component: engine
 2016-11-01 20:32:13 -07:00
Yong Tang 21f49a2c56 Fix issue related to duplicate identical bind mounts for docker run 
This fix tries to address the issue raised in 27969 where
duplicate identical bind mounts for `docker run` caused additional volumes
to be created.

The reason was that in `runconfig`, if duplicate identical bind mounts
have been specified, the `copts.volumes.Delete(bind)` will not truly
delete the second entry from the slice. (Only the first entry is deleted).

This fix fixes the issue.

An integration test has been added to cover the changes

This fix fixes 27969.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90ce6de50b3e5e39f8417e9804970c0fd1377062
Component: engine
 2016-11-01 20:31:34 -07:00
Sebastiaan van Stijn c22d6298d7 Merge pull request #27855 from justincormack/check-ext3 
Do not warn in check-config script about ext3 if provided by ext4
Upstream-commit: b5589fba89bdea5424b3555a892c43921a681974
Component: engine
 2016-11-01 20:21:48 -07:00
Darren Stahl b8d232c6a7 Windows: Rename layers before deletion 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: be68006d1928b34936050175e67f85b4ee7f67cf
Component: engine
 2016-11-01 18:05:09 -07:00
Tibor Vass 62f0d03ec2 Merge pull request #27920 from mavenugo/npp 
Basic IT for plugin-v2 network driver
Upstream-commit: 1966f8e09d6b4bf4d65397f03e35a61bc1f979d8
Component: engine
 2016-11-01 17:46:06 -07:00
Tibor Vass f3bf70acc7 Merge pull request #27960 from anusha-ragunathan/plugin_teardown 
Add plugin cleanup as part of standard TearDownTest.
Upstream-commit: 0aefcd6ab660c21c6f7ed4486ab0033a99b9464a
Component: engine
 2016-11-01 17:36:51 -07:00
Bruno Tavares cbd967cd2a Nuke when graphdir is a mount 
Previously, when the graphdir was a root of a mountpoint, we would not
be able to cleanup the graphdir, as the script would umount in case
target dir is a mount itself

```/etc/mtab
/dev/xvdc1 /var/lib/docker btrfs
```

When running the script, the graphdir would be unmounted and it would
remove a (possibly) empty folder.

```
Nuking /var/lib/docker ...
  (if this is wrong, press Ctrl+C NOW!)

  + sleep 10

  + umount -f /var/lib/docker
  + rm -rf /var/lib/docker
  ```

This PR includes the necessary changes to nuke the folder on this
scenario, including when the graphdir is a btrfs mount iself.

Signed-off-by: Bruno Tavares <btavare@thoughtworks.com>
Upstream-commit: 5f98b977496b5c8430162b129cb94c88efb0f3b6
Component: engine
 2016-11-01 22:22:25 -02:00
Tibor Vass 60d0e46ea2 Merge pull request #27924 from vieux/prevent_panic_volume_plugin_disable 
prevent panic when docker build & volume plugin is disabled
Upstream-commit: cc8b8ce0b3d2d6b3345687464d3a3b1c2c4971ef
Component: engine
 2016-11-01 14:57:52 -07:00