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

3011 commits

Author SHA1 Message Date
Felix Abecassis
ac3d74b0b4 install: map debian_version 9.X to debian stretch 
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2017-01-26 10:51:08 -08:00
Alexander Morozov
a69c4129e0 Merge pull request #28409 from dnephin/swagger-gen-more 
Generate more types from the swagger spec
 2017-01-26 10:35:34 -08:00
Kenfe-Mickaël Laventure
5e74dc11e3 Merge pull request #30391 from andrewhsu/check-changelog-date 
validate CHANGELOG.md dates are in descending order
 2017-01-24 11:18:21 -08:00
John Howard
f32b267d1c
Windows updates for .git in .dockerignore 
Signed-off-by: John Howard jhoward@microsoft.com
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-24 14:43:02 +01:00
Vincent Demeester
fae6ca2bb4
Do not required .git in the build context 
- export DOCKER_GITCOMMIT in the Makefile
- prioritize DOCKER_GITCOMMIT against the `git` command in
  `./hack/make.sh`
- Also add `integration-cli/bundles` to gitignore (it's generated when
  using integration-cli shell)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-24 14:42:57 +01:00
Vincent Demeester
ac30c4c06c Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd 
Vendor swarmkit, containerd, and related dependencies
 2017-01-24 11:00:35 +01:00
Andrew Hsu
6cca6bf942 validate changelog dates are in descending order 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-01-23 19:19:35 -08:00
Brian Goff
5e46ad159d Merge pull request #30306 from AkihiroSuda/update-proxy 
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
 2017-01-23 21:07:25 -05:00
Aaron Lehmann
3e987e1732 Vendor swarmkit, containerd, and related dependencies 
Update swarmkit to 037b491.

As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-23 17:51:14 -08:00
Vincent Demeester
eac3e4b5dd Merge pull request #29883 from dnephin/update-to-latest-schema 
Update compose schema v3
 2017-01-23 23:18:31 +01:00
Tibor Vass
7a97705b52 Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging 
[master] Fix conflicts with newly updated selinux policies
 2017-01-20 15:13:18 -08:00
Alexander Morozov
50a72c7467 Merge pull request #28454 from glensc/init-args 
do not require custom build of tini
 2017-01-20 10:03:58 -08:00
Daniel Nephin
de1ffebf19 Update Compose schema to match docker-compose. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-20 12:36:57 -05:00
Vincent Demeester
ba4f8f06b3 Merge pull request #29147 from Microsoft/jjh/makeroot 
Windows: make.ps1 calc root
 2017-01-20 15:01:58 +01:00
Akihiro Suda
541aa27d03 update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-20 06:18:12 +00:00
Zhang Wei
827bbe90a0 Fix some typos 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-01-19 15:29:28 +08:00
Christopher Jones
5fd7ef2c4b
add suggestions in failure message in install script 
Adds suggestions to where you can install docker in the case
that the install script fails to install because of the architecture
not being officially supported.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-01-18 15:11:20 -05:00
Brian Goff
0e8c7d7277 Merge pull request #30208 from justincormack/no-sqlite 
Remove sqlite dependency
 2017-01-18 13:15:38 -05:00
Justin Cormack
f8119bb7a7 Remove sqlite 
This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-18 12:27:21 +00:00
Zhang Wei
062ce13e9c Add missing ${DOCKER_BUILD_ARGS} 
Add missing "${DOCKER_BUILD_ARGS}" for building rpm with `docker build`,
this is quite important when running `make rpm` behind http proxy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-01-17 20:10:48 +08:00
Vincent Demeester
06e3812b6e Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group 
Don't encourage adding user to docker group
 2017-01-12 18:28:16 +01:00
Justin Cormack
91b42cf842 Do not use keyservers to fetch GPG keys for apt 
The keyserver infrastructure is unreliable, and just adds another point
of failure without adding any security. Instead, commit the key used at
build time for ZFS to the repo, and inline our signing key into the
install script rather than just its fingerprint.

fix #28510
fix #13555

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-07 12:06:52 +00:00
Brian Goff
ec9a05e5e2 Fix conflicts with newly updated selinux policies 
The base selinux policies on centos/rhel/oraclelinux have all been
updated in a way that conflicts with the policies we install with
`docker-engine-selinux`. This patch fixes these conflicts.

In addition, removes special cases for old/unsupported versions of
fedora in our selinux package, and change to use a single minimum
version for the selinux base policy package, as this is the minimum
version required to use our selinux policy package.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-01-06 16:04:24 -05:00
Vincent Demeester
6129e6ce3e Merge pull request #29697 from yuexiao-wang/fix-docker-daemon 
Update docker daemon to dockerd
 2017-01-04 11:55:38 +01:00
Daniel Nephin
16bdbaaa33 Convert ContainerTopOKResponse from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
8d5f558de0 Generate GraphDriver from spec, and fix up image spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
5988b84e4f Generate ImageDeleteResponse from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
b462c93edb Generate ImageHistory from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:44 -05:00
Daniel Nephin
b83d9bf6a9 Generate ContainerChanges from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 09:35:40 -05:00
Daniel Nephin
38d08b0bd1 Add validation for compose schema bindata. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-28 14:45:44 -05:00
Daniel Nephin
f5af9b9738 Replace vendor of aanand/compose-file with a local copy. 
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-27 16:17:24 -05:00
yuexiao-wang
62cc802f61 Update docker daemon to dockerd 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-27 17:32:15 +08:00
Eric Curtin
5b4a528b57 Add warning on docker group suggestion 
Signed-off-by: Eric Curtin <ericcurtin17@gmail.com>
 2016-12-21 15:02:50 +00:00
John Stephens
0ce6c12f88
Fix regular expression for PowerShell DCO check 
Signed-off-by: John Stephens <johnstep@docker.com>
 2016-12-20 15:32:39 -08:00
Sebastiaan van Stijn
611a633ba4
fix powershell dco check 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-16 23:48:27 +01:00
Vincent Demeester
59ba895a0f Merge pull request #29208 from andrewhsu/validate-changelog 
validate CHANGELOG.md is well-formed
 2016-12-12 17:59:41 +01:00
Sebastiaan van Stijn
7caf77ac18 Merge pull request #23480 from thaJeztah/remove-unsupported-distros 
Remove unsupported distros from install script
 2016-12-09 22:38:18 +01:00
Vincent Demeester
f2533c0266 Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs 
Set inspect type in ensure-emptyfs
 2016-12-09 21:40:58 +01:00
Vincent Demeester
b8e1553765 Merge pull request #29231 from Microsoft/jjh/dcocheck 
Windows: make.ps1 fix DCO check
 2016-12-09 17:07:31 +01:00
Brian Goff
71ca76e8f2 Set inspect type in ensure-emptyfs 
This keeps the test daemon logs from being flooded with calls to lookup
emptyfs for other types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-12-09 08:26:05 -05:00
Andrew Hsu
aec52767b9 validate changelog format 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-12-07 22:30:56 -08:00
John Howard
e538c1fdca Windows: make.ps1 fix DCO check 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-12-07 17:58:07 -08:00
Justin Cormack
74ecec9199 Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script 
Add variable DOCKER_BUILD_ARGS to build-deb script
 2016-12-07 09:02:47 -08:00
Vincent Demeester
aefbc03444 Make sure we don't run integration cli test if compilation fails 
Otherwise, while using test-integration-shell, it runs the tests using
the previously compiled test binary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-06 23:37:08 +01:00
Luiz Svoboda
63aaf5e316 Add variable DOCKER_BUILD_ARGS to build-deb script 
Some containers were being built (`docker build`) without
the DOCKER_BUILD_ARGS variable, which was causing some
issues because of the lack of network proxy configuration.

Fixes #29132

Signed-off-by: Luiz Svoboda <luizek@gmail.com>
 2016-12-06 10:17:41 -02:00
Sebastiaan van Stijn
080d7a5543 Merge pull request #29145 from Microsoft/jjh/make 
Windows: make.ps1 Throw exception on failure
 2016-12-06 12:10:56 +01:00
Michael Friis
8d47858f96 remove bonus whitespace 
Signed-off-by: Michael Friis <friism@gmail.com>
 2016-12-05 20:21:25 -08:00
Victor Vieux
29e728e9b2 Merge pull request #29082 from runcom/fix-rpm-buildtime 
hack/make.sh: fix BUILDTIME
 2016-12-05 16:31:29 -08:00
John Howard
8c93a41044 Windows: make.ps1 calc root 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-12-05 13:26:04 -08:00
John Howard
8c22a00b77 Windows: make.ps1 Throw exception on failure 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-12-05 09:58:56 -08:00