docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Lehmann
20633e3e12 Make FileStore only allow operations on files inside the store 
Paths that abuse .. shouldn't be able to escape from the filestore. This
is especially important when importing keys from zip files that could
have "creative" paths encoded in the zip.

Add test coverage for this protection.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-15 17:14:56 -07:00
Aaron Lehmann
eb8a7a0e25 Add ImportKeysZip and test coverage 
This function reads a zip file and populates the keystores with the keys
in the zip file. Root keys are left encrypted, and non-root keys are
decrypted before being added to the keystore.

The unit test first exports a repo's keys to a zip file, then imports it
into another repo. It checks that all the correct keys exist in the new
repo after the import operation.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-15 17:14:56 -07:00
Aaron Lehmann
878a8a083d Add ExportAllKeys function 
This allows all keys to be exported to a zip file. Keys that were
already encrypted are kept as-is, and keys that weren't encrypted are
encrypted with the specified passphrase.

Also add a unit test that creates the zip file and checks the expected
keys all exist, and are all encrypted with the expected passphrase.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-15 17:14:49 -07:00
David Calavera
cd642973fa Merge pull request #14661 from LK4D4/vet_warns 
Fix some formatting calls
 2015-07-15 16:41:18 -07:00
David Calavera
a81dcaef93 Merge pull request #13993 from Ramzec/index_iteration 
graph: use truncindex consistently to iterate graph entries
 2015-07-15 16:39:59 -07:00
Jeffrey Morgan
0c2f4284f1 Change download links 2015-07-15 16:31:38 -07:00
David Lawrence
72d7d35221 fixing database queries 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-07-15 16:19:14 -07:00
Jessica Frazelle
c850e97c84 Add release-deb & release-rpm scripts. 
These will create the apt & yum repos for the deb/rpms generated by build-deb
and build-rpm.

Adds sign-repo script which signs the repo metadata with a gpg key.

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-15 15:54:00 -07:00
Martin Schygulla
64e21418dd Merge branch 'master' of https://github.com/docker/machine into enhanced-vmwarefusion-driver 2015-07-16 00:33:14 +02:00
Jeffrey Morgan
8e46236302 Merge branch 'master' of github.com:docker/toolbox 2015-07-15 15:32:28 -07:00
Jeffrey Morgan
1867d9ea9b bump versions 2015-07-15 15:32:21 -07:00
Jeffrey Morgan
011ce79fa1 Bump virtualbox and Kitematic 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 15:31:08 -07:00
Jeffrey Morgan
fd5474a954 Merge branch 'master' of github.com:docker/toolbox 2015-07-15 15:29:29 -07:00
Jeffrey Morgan
3fbbf8b46b Fix icons & start script 2015-07-15 15:29:21 -07:00
Jeffrey Morgan
e8bc24e37c Bump for 1.7.1 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 15:28:31 -07:00
Jeffrey Morgan
ae7535723d Bump machine to 0.3.1 rc1 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 15:14:48 -07:00
moxiegirl
947bce043e Merge pull request #1699 from bfirsh/link-to-waffle-board-from-contributing 
Link to waffle board from CONTRIBUTING.md
 2015-07-15 15:13:51 -07:00
Jeffrey Morgan
396074d235 Revert "Temporary bump of docker-machine" 
This reverts commit 23010796e6.
 2015-07-15 14:49:39 -07:00
Jeffrey Morgan
23010796e6 Temporary bump of docker-machine 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 14:45:29 -07:00
Jeffrey Morgan
ac34c4489d Merge branch 'master' of github.com:docker/toolbox 2015-07-15 14:11:20 -07:00
Jeffrey Morgan
8766c7fd7d Ask users before removing vms 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 14:11:14 -07:00
Jeffrey Morgan
85566975ba No error on signing fail 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 14:10:25 -07:00
Arnaud Porterie
57c43960f8 Remove reviewing process from MAINTAINERS 
The pull request reviewing process and labeling strategy is described as
part of a dedicated file in `project/REVIEWING.md`: remove the existing
description from the `MAINTAINERS` file.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-07-15 13:56:04 -07:00
Jeffrey Morgan
d29b44f052 Merge branch 'master' of github.com:kitematic/kitematic 2015-07-15 13:41:01 -07:00
Jeffrey Morgan
83dbcff97c Bump to 0.7.5 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 13:40:53 -07:00
Jeffrey Morgan
81326fe8ad Merge pull request #820 from kitematic/fix-vbox-5 
Fixed issues with Virtualbox 5
 2015-07-15 13:40:24 -07:00
Jeffrey Morgan
53d08470b0 Fix VBox for 5.0.0 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-07-15 13:39:04 -07:00
Arnaud Porterie
6157937f67 Document reviewing process and labels 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-07-15 13:14:21 -07:00
Stephen Day
7c5c26b341 Merge pull request #633 from RichardScothern/manifest-verification 
External manifest verification
 2015-07-15 13:00:05 -07:00
Jessica Frazelle
4a5fd6c0f9 add tianon's suites.sh file 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-15 12:48:49 -07:00
Alexander Morozov
a5142f6ac3 Fix some formatting calls 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-15 12:25:50 -07:00
Richard
f331da2daa Allow Manifest Service to be configured with function arguments 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-07-15 12:25:16 -07:00
Nathan LeClaire
2c36635dd4 Merge pull request #1377 from nathanleclaire/integration_rm_rm 
Make some clean ups and fixes to the integration tests
 2015-07-15 11:52:02 -07:00
Stephen Day
2b88cb9413 Merge pull request #651 from duglin/ErrArgs 
Add ability to pass in substitution args into an Error
 2015-07-15 11:22:59 -07:00
David Calavera
46aea60fb0 Merge pull request #14332 from ankushagarwal/failedLogin 
Add 500 check for registry api call
 2015-07-15 11:19:31 -07:00
Brian Goff
e98a881570 Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1 
Integration test refactors to use dockerCmd
 2015-07-15 14:03:58 -04:00
Doug Davis
94e2e9f4a0 Add ability to pass in substitution args into an Error 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-15 11:02:10 -07:00
Nathan LeClaire
f74d71741f Merge pull request #1525 from tg123/stdout 
change inspect output to stdout (was stderr)
 2015-07-15 10:46:42 -07:00
Jessie Frazelle
386f11a63d Merge pull request #14555 from sdurrheimer/master 
Zsh completion updates and improvements
 2015-07-15 10:40:41 -07:00
Jeffrey Morgan
53f74e6f56 Merge pull request #796 from TeckniX/refactor 
Migrated all required module calls to ES6 imports equivalents
 2015-07-15 09:43:11 -07:00
Jessie Frazelle
308ecafad8 Merge pull request #14655 from duglin/CleanupBuild 
Cleanup build tmp dir stuff
 2015-07-15 09:42:24 -07:00
Jessie Frazelle
e46c7060cc Merge pull request #14643 from dmcgowan/fix-canonical-repo-info 
Set canonical name correctly
 2015-07-15 09:39:01 -07:00
Aanand Prasad
cd44179305 Merge pull request #1705 from aanand/fix-labels-null 
Handle case where /containers/json returns "Labels": null
(cherry picked from commit 7b9664be8e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 17:33:08 +01:00
Aanand Prasad
7b9664be8e Merge pull request #1705 from aanand/fix-labels-null 
Handle case where /containers/json returns "Labels": null
 2015-07-15 17:30:31 +01:00
Aanand Prasad
0c5c8d1f00 Handle case where /containers/json returns "Labels": null 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 17:13:33 +01:00
Mazz Mosley
5a46230555 Merge pull request #1703 from aanand/rename-max-workers 
Rename max workers environment variable
 2015-07-15 16:59:53 +01:00
Aanand Prasad
ec8bf066ba Make sure up/restart/stop timeout is an int 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:56:39 +01:00
David Calavera
e0728035fe Merge pull request #14636 from calavera/bump_changelog 
Bump changelog from 1.7.1
 2015-07-15 08:56:03 -07:00
Aanand Prasad
f03dec766d Rename max workers env var and fix docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:43:43 +01:00
Aanand Prasad
35aef1aee0 Merge pull request #1687 from mnowster/1651-parallelise-stopping-containers 
1651 parallelise stopping containers
 2015-07-15 16:29:54 +01:00