beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35788 commits 14 branches 412 tags 338 MiB
Commit graph

35788 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Howard
63f9c7784b LCOW: Log stderr on failures 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-09-26 13:23:04 -07:00
Brian Goff
d0970ab9a4
Merge pull request #37875 from Microsoft/jjh/bumpopengcs 
Bump Microsoft/opengcs to v0.3.9
 2018-09-26 10:19:26 -07:00
Yong Tang
7bfec8cd80
Merge pull request #37400 from olljanat/34795-allow-npipe 
Allow mount type npipe on service/stack
 2018-09-26 09:54:42 -07:00
Sebastiaan van Stijn
7fe4f7d250
Merge pull request #37887 from liyongxin/master 
typo fix retreived
 2018-09-26 12:27:50 +02:00
Yong Tang
472a52861c
Merge pull request #37907 from tiborvass/remove-docker-prefix-containerd 
Remove 'docker-' prefix for containerd and runc binaries
 2018-09-26 02:52:31 -07:00
Vincent Demeester
9f296d1e6f
Merge pull request #37701 from dperny/add-swarmkit-sysctl-support 
Add support for sysctl options in services
 2018-09-26 09:06:22 +02:00
liyongxin
25d9c54b61 typo fix retreived 
Signed-off-by: liyongxin <yxli@alauda.io>
Signed-off-by: Yongxin Li <yxli@alauda.io>
 2018-09-26 10:51:22 +08:00
Brian Goff
8e908cab46
Merge pull request #37904 from lifubang/idprefix 
fixes display text in Multiple IDs found with provided prefix
 2018-09-25 16:55:46 -07:00
Brian Goff
12d5eb8e22
Merge pull request #37703 from kolyshkin/rm-dead-code 
daemon/setMounts(): remove dead code
 2018-09-25 16:07:15 -07:00
Tibor Vass
52b60f705c fix daemon tests that were using wrong containerd socket 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-25 17:57:35 +00:00
Tibor Vass
361412c79e hack/make: remove 'docker-' prefix when copying binaries 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-25 16:58:28 +00:00
Tibor Vass
34eede0296 Remove 'docker-' prefix for containerd and runc binaries 
This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-24 21:49:03 +00:00
Tibor Vass
a9c061deec
Merge pull request #37906 from tiborvass/remove-boltdb 
vendor: update swarmkit to 9f271c2 and remove boltdb
 2018-09-24 13:21:07 -07:00
Tibor Vass
82388d048a vendor: update swarmkit to 9f271c2 and remove boltdb 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-24 17:36:07 +00:00
Sebastiaan van Stijn
2a63a5f7a5
Merge pull request #37891 from mirake/fix-typos 
Fix some typos
 2018-09-24 17:22:34 +02:00
Lifubang
00eb3480dc fixes display text in Multiple IDs found with provided prefix 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-09-24 12:17:31 +08:00
Yong Tang
be79d286ea
Merge pull request #37585 from thaJeztah/preserve_registry_errors 
Include original error when translating distribution errors
 2018-09-23 06:29:00 -07:00
Yong Tang
fb7883e980
Merge pull request #37846 from tiborvass/buildkit-gc 
builder: use buildkit's GC for build cache
 2018-09-22 10:00:06 -07:00
Yong Tang
30b5eb19d4
Merge pull request #37851 from adshmh/migrate-ipc-integration-tests-to-integration-container 
migrated ipc integration tests to integration/container
 2018-09-22 09:58:56 -07:00
John Howard
6672769f52
Merge pull request #37899 from tiborvass/vendor-buildkit 
builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
 2018-09-21 18:38:19 -07:00
Tibor Vass
4a776d0ca7 builder: use buildkit's GC for build cache 
This allows users to configure the buildkit GC.

The following enables the default GC:
```
{
  "builder": {
    "gc": {
      "enabled": true
    }
  }
}
```

The default GC policy has a simple config:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "defaultKeepStorage": "30GB"
    }
  }
}
```

A custom GC policy can be used instead by specifying a list of cache prune rules:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "policy": [
        {"keepStorage": "512MB", "filter": ["unused-for=1400h"]]},
        {"keepStorage": "30GB", "all": true}
      ]
    }
  }
}
```

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-21 22:06:00 +00:00
Tibor Vass
d0f00bc1fb builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-21 20:43:26 +00:00
Tõnis Tiigi
b1116479b2
Merge pull request #37852 from AntaresS/patch-buildkit 
add support for "registry-mirrors" and "insecure-registries" to buildkit
 2018-09-21 09:42:35 -07:00
Anda Xu
171d51c861 add support of registry-mirrors and insecure-registries to buildkit 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-09-20 11:53:02 -07:00
Drew Erny
14da20f5e7 Add support for sysctl options in services 
Adds support for sysctl options in docker services.

* Adds API plumbing for creating services with sysctl options set.
* Adds swagger.yaml documentation for new API field.
* Updates the API version history document.
* Changes executor package to make use of the Sysctls field on objects
* Includes integration test to verify that new behavior works.

Essentially, everything needed to support the equivalent of docker run's
`--sysctl` option except the CLI.

Includes a vendoring of swarmkit for proto changes to support the new
behavior.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2018-09-20 10:51:56 -05:00
Rui Cao
3f02d91ef8 Fix some typos 
Signed-off-by: Rui Cao <ruicao@alauda.io>
 2018-09-20 20:00:35 +08:00
Vincent Demeester
5d848e66df
Merge pull request #37885 from adshmh/remove-TestExportContainerWithOutputAndImportImage-redundant-integration-test 
Remove the redundant integration test TestExportContainerWithOutputAndImportImage
 2018-09-20 11:14:56 +02:00
Arash Deshmeh
9ad4ef7848 remove the redundant integration test TestExportContainerWithOutputAndImportImage 
This test is the same as TestExportContainerAndImportImage, except for the output file option.
A unit test has been added to docker/cli to cover the output file option. Therefore this test can be removed.

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-09-19 16:21:22 -04:00
Sebastiaan van Stijn
9c65b2206d
Merge pull request #37877 from Microsoft/jjh/bumpcontainerd 
Bump containerd to d97a907f
 2018-09-19 20:20:27 +02:00
Sebastiaan van Stijn
dc26e1e7b7
Merge pull request #37871 from AntaresS/fix-config-conflicts 
fix daemon won't start bug caused by daemon.json and cli flags duplications
 2018-09-19 20:19:54 +02:00
John Howard
e57b2a8066 Bump containerd to d97a907f 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-09-18 10:26:13 -07:00
John Howard
c82f6a8faf Bump Microsoft/opengcs to v0.3.9 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-09-18 10:13:24 -07:00
Sebastiaan van Stijn
d6a7c22f7b
Merge pull request #37861 from TinySong/fix-typo 
fix typos in service.go and plugin.go
 2018-09-18 12:48:37 +02:00
Vincent Demeester
8efb908581
Merge pull request #37847 from thaJeztah/more_permissive_daeon_conf_dir 
Loosen permissions on /etc/docker directory
 2018-09-18 08:49:38 +02:00
song
c80e20f93f fix typos in service.go and plugin.go 
Signed-off-by: song <tinysong1226@gmail.com>
Signed-off-by: Rongxiang Song <tinysong1226@gmail.com>
 2018-09-18 10:48:39 +08:00
Anda Xu
8392d0930b fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-09-17 16:12:04 -07:00
Tibor Vass
bbe08dc7f0
Merge pull request #37854 from tiborvass/remove-leaked-image-warning 
daemon/images: removed "found leaked image layer" warning, because it…
 2018-09-17 14:33:51 -07:00
Anda Xu
308701fac6 update vendor 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-09-16 12:57:17 -07:00
Olli Janatuinen
1144159a9f Updated swagger config 
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
 2018-09-16 19:52:33 +03:00
Olli Janatuinen
83d9b9e4d9 Allow mount type npipe on Windows 
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
 2018-09-16 06:57:38 +00:00
Yong Tang
ed392603ac
Merge pull request #37486 from adshmh/migrate-docker_cli_secret_create_test-integration-tests-to-integration-secret 
migrate create secret integration tests from integration-cli to integration/secret
 2018-09-15 06:20:27 -07:00
Yong Tang
3c5317ed39
Merge pull request #37444 from adshmh/migrate-docker_api_create_test-integration-tests-to-integration_container 
Refactor and migrate integration tests from integration-cli/docker_api_create_test to integration/container
 2018-09-15 06:19:09 -07:00
Yong Tang
2d7aa92b7d
Merge pull request #37805 from kolyshkin/bump-etcd 
vendor: bump etcd to v3.3.9
 2018-09-15 06:18:08 -07:00
Tibor Vass
5aa222d0fe daemon/images: removed "found leaked image layer" warning, because it is expected now with buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-15 01:14:00 +00:00
Arash Deshmeh
febefb850d migrated ipc integration tests to integration/container 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-09-14 17:19:34 -04:00
Sebastiaan van Stijn
9299561bd3
Merge pull request #37736 from selansen/master 
Global Default AddressPool - Update
 2018-09-14 18:47:42 +02:00
Akihiro Suda
5adee401d1
Merge pull request #37843 from Microsoft/jjh/boltdb 
Revendor libnetwork @ 36d3bed0e9
 2018-09-14 23:22:36 +09:00
Sebastiaan van Stijn
06b9588c2d
Merge pull request #37759 from dmcgowan/fix-libcontainerd-startup-error 
Add fail fast path when containerd fails on startup
 2018-09-14 15:15:38 +02:00
Sebastiaan van Stijn
cecd981717
Loosen permissions on /etc/docker directory 
The `/etc/docker` directory is used both by the dockerd daemon
and the docker cli (if installed on the saem host as the daemon).

In situations where the `/etc/docker` directory does not exist,
and an initial `key.json` (legacy trust key) is generated (at the
default location), the `/etc/docker/` directory was created with
0700 permissions, making the directory only accessible by `root`.

Given that the `0600` permissions on the key itself already protect
it from being used by other users, the permissions of `/etc/docker`
can be less restrictive.

This patch changes the permissions for the directory to `0755`, so
that the CLI (if executed as non-root) can also access this directory.

> **NOTE**: "strictly", this patch is only needed for situations where no _custom_
> location for the trustkey is specified (not overridden with `--deprecated-key-path`),
> but setting the permissions only for the "default" case would make
> this more complicated.

```bash
make binary shell

make install

ls -la /etc/ | grep docker

dockerd
^C

ls -la /etc/ | grep docker
drwxr-xr-x 2 root root    4096 Sep 14 12:11 docker
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-14 14:14:39 +02:00
Sebastiaan van Stijn
3735ea7b76
Merge pull request #37741 from mooncak/fix_typos 
fix typos in experimental.go and buildargs.go
 2018-09-14 11:53:54 +02:00