47845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sven Dowideit	0fed4fd0e5	Docs validation checker fixes ... Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>	2015-11-25 11:53:38 +10:00
Jeffrey Morgan	ecd6b4bf17	Delete .jshintrc	2015-11-24 20:16:52 -05:00
Martin Kelly	3e5ac74241	install.sh: fix for multiarch deb/ubuntu ... Currently, the Docker repos will trigger apt-get errors on a multiarch-configured deb system because the repos don't contain all architectures. For example, on a multiarch system supporting amd64 and armhf, apt-get will look for armhf Docker packages, fail to find them, and error out. Fix this by qualifying the repo line with the currently active architecture. This fixes issue #18207. Signed-off-by: Martin Kelly <martin@surround.io>	2015-11-24 16:53:13 -08:00
Avi Miller	09b7af9095	Updated LICENSE file to match selinux-policy and the license in the docker-engine-selinux.spec file. ... Signed-off-by: Avi Miller <avi.miller@oracle.com>	2015-11-25 11:53:01 +11:00
Dong Chen	59a1f2427b	Close tcp connection when client stops '/events' request. ... Signed-off-by: Dong Chen <dongluo.chen@docker.com>	2015-11-24 16:18:18 -08:00
Olivier Gambier	d7a4f6cb6a	Merge pull request #1207 from Djelibeybi/master ... Adding additional command to enable the shared system certificates	2015-11-24 15:49:58 -08:00
Avi Miller	a7199f5d7c	Fixed whitespace and made the command consistent with the other examples. ... Signed-off-by: Avi Miller <avi.miller@oracle.com>	2015-11-25 10:41:40 +11:00
Avi Miller	b27d479ad5	Adding additional comment to enable the shared system certificates store. ... Signed-off-by: Avi Miller <avi.miller@oracle.com>	2015-11-25 10:30:12 +11:00
Alexander Morozov	900c8f5847	Merge pull request #18202 from aidanhs/aphs-content-addressability-layerstore ... Rearrange layerstore locking	2015-11-24 14:53:10 -08:00
Ying Li	9c3d87d5eb	When validating root.json on the server, timestamp threshold must be 1. ... This is because the server handles the timestamp key and timestamp signing. So there can only ever be 1 key. Thanks @mtrmac for pointing this out. This change also refactors some of the test code somewhat. Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-24 17:47:00 -05:00
Brian Goff	87e7ee9142	Merge pull request #18201 from calavera/split_container_router ... [Carry 17736] Container router and backend.	2015-11-24 17:07:04 -05:00
Aidan Hobson Sayers	cbf55b924f	Rearrange layerstore locking ... Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>	2015-11-24 21:45:50 +00:00
Jeffrey Morgan	99c43f8dfb	Travis: build only on mac ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:45:38 -05:00
Jeffrey Morgan	c9d94f9901	Travis: apt-get update ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:41:55 -05:00
Alexander Morozov	5463e26570	Merge pull request #18203 from aidanhs/aphs-content-addressability-layerstore-releaselayer ... Make releaseLayers iterative rather than recursive, remove useless func	2015-11-24 13:41:42 -08:00
Jeffrey Morgan	53ef34a13d	Travis: add sudo to apt-get ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:39:02 -05:00
Jeffrey Morgan	f50a846d26	Travis: install wine on linux ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:36:50 -05:00
Jeffrey Morgan	94a55bc87e	Travis: lint .travis.yml ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:33:53 -05:00
Jeffrey Morgan	5191e30d86	Merge branch 'master' of github.com:kitematic/kitematic	2015-11-24 16:29:33 -05:00
Jeffrey Morgan	dbdbee24cc	Travis: install on new line ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:29:29 -05:00
Jeffrey Morgan	dcb4fbf5a9	Update README.md	2015-11-24 16:27:55 -05:00
Jeffrey Morgan	637306b03c	Remove circle.yml ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:26:08 -05:00
Jeffrey Morgan	30118cfd7f	Travis: release script ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 16:19:58 -05:00
Jeffrey Morgan	179f437c35	Travis: fix node version ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 15:55:19 -05:00
Jeffrey Morgan	f03f307b57	Travis: use build matrix for dual os	2015-11-24 15:45:08 -05:00
Jeffrey Morgan	d804a20527	Travis: add linux build ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 15:41:32 -05:00
Jeffrey Morgan	80f01815a8	Travis: run release-mac ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 15:28:59 -05:00
Alexandre Vazquez	d060ef4d2a	Merge remote-tracking branch 'refs/remotes/kitematic/master'	2015-11-24 21:24:39 +01:00
Jeffrey Morgan	7b79874a8a	Temporary release-mac task ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 15:17:31 -05:00
Jeffrey Morgan	750af65ffc	Fix release command ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 15:03:00 -05:00
Jeffrey Morgan	8751445085	Chmod +x release script ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 14:50:03 -05:00
Jeffrey Morgan	52dbf1a91d	Move release script to ci directory ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 14:49:40 -05:00
Aidan Hobson Sayers	a4d768538a	Make releaseLayers iterative rather than recursive, remove useless func ... Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>	2015-11-24 19:40:09 +00:00
Jeffrey Morgan	11e766b23d	Travis: temporarily remove wine ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 14:29:30 -05:00
David Calavera	85c3c6865e	Split container backend into several specialized interfaces. ... Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-11-24 14:03:39 -05:00
David Calavera	38abba9e2c	Move versioned references of inspect functions to the daemon. ... Leaving only one versioned main function that a backend must implement. Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-11-24 14:03:39 -05:00
Dong Chen	fa8d96ebe2	Add container package for container APIs. ... Signed-off-by: Dong Chen <dongluo.chen@docker.com>	2015-11-24 14:03:07 -05:00
Dong Chen	a5bf10f37e	move container files to a separate folder. Following changes will update them. ... Signed-off-by: Dong Chen <dongluo.chen@docker.com>	2015-11-24 14:03:07 -05:00
David Calavera	a2ab05098d	Merge pull request #17924 from aaronlehmann/content-addressability ... Content addressability	2015-11-24 11:01:33 -08:00
Ying Li	bd84f3cce1	Address review comments. ... Thanks @mtrmac! Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-24 13:55:15 -05:00
Guillaume Hain	de0b2efd2a	Implement Linux support	2015-11-24 19:53:35 +01:00
Jeffrey Morgan	2d8de479ce	Add wine to travis ci ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 13:33:50 -05:00
Alexander Morozov	0dec4403b0	Merge pull request #18150 from unclejack/add_python_dev ... Dockerfile: add python-dev to fix Python.h errors	2015-11-24 10:31:52 -08:00
Carol Fager-Higgins	ebf4db1442	added missing code to upgrade to Enable the Docker daemon as a service and then start it ... edited link on emergency access to DTR in adminguide added message in RN regarding LDAP accepting only lowercase names added note in accts doc that expanded on RN about first creating a repo before pushing edits based on convo with mary on RN and accts added to the RNs about namespace workaround and LDAP auth release notes for 1.4.1 fixed small typos to RNs changed word in RN corrected date in RN to tomorrow fixed errant numbering tiny typo in RN--good to go Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>	2015-11-24 10:30:46 -08:00
Jeffrey Morgan	11c5c223ef	Add npm release and fix travis build ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 13:26:02 -05:00
Daniel Nephin	8930fa25d6	Merge pull request #2387 from dnephin/update_release_notes ... cherry-pick release notes from 1.5.1	2015-11-24 13:25:21 -05:00
Daniel Nephin	6e89a5708f	cherry-pick release notes from 1.5.1 ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2015-11-24 13:24:46 -05:00
Guillaume Hain	0ed907553b	Merge remote-tracking branch 'upstream/master'	2015-11-24 19:18:30 +01:00
Morgan Bauer	17d4e82944	Formatting content digest calculation to avoid copyright symbols ... - resolves #1197 Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>	2015-11-24 10:13:34 -08:00
Jeffrey Morgan	1d8d198037	Remove unused logos, bump version ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-24 13:12:57 -05:00