docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
8,920 Commits 12 Branches 296 Tags
5490b8933dbbbfdb2fd079079bbbfa596ccf7fa5
Commit Graph

48 Commits

Author SHA1 Message Date
unclejack
3efba6310d Merge pull request #5402 from SvenDowideit/dont-update-authors 
Don't add yourself to the AUTHORs file - its generated
Upstream-commit: 341a2b85beb04132814dfc884c25e425e4df20bd
Component: engine
 2014-05-29 02:00:29 +03:00
SvenDowideit
17bb4fbe20 gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 147ad3480da6c9e966b1db0d9d607dc6b1483327
Component: engine
 2014-05-28 11:11:47 +10:00
James Turnbull
2119e00789 Merge pull request #5765 from jamtur01/contribf 
Added to small patch exemption to cover Markdown/syntax errors
Upstream-commit: f37339c2db413c1d3758bc98f14b209ec943d29e
Component: engine
 2014-05-21 17:13:03 +10:00
James Turnbull
799cb05f17 Added to small patch exemption to cover Markdown/syntax errors in documentation 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: f664e9a7d9a584220c28486f8e40cb1a1023e7f6
Component: engine
 2014-05-14 22:43:54 +02:00
Aaron Huslage
184234bcc1 Fixing pre-commit-msg URL 
URL referred to raw.github.com instead of raw.githubusercontent.com. Fixed.

Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
Upstream-commit: 5dfe0945c34402760475bbf51001d0ae0fb69ccb
Component: engine
 2014-05-09 13:56:20 -04:00
Aaron Huslage
0cfb634c08 Post-commit hook URL fix 
Updating CONTRIBUTING to include the correct URL for the post-commit hook.

Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
Upstream-commit: 10766e1fb46770a407b2b17ade313dd5ae85054e
Component: engine
 2014-05-05 10:28:52 -04:00
Sven Dowideit
d799d709fb Don't add yourself to the AUTHORs file - its generated 
Last time I discussed this with @tianon, the AUTHORS was being
regenerated regularly, so we could remove this step.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b06ad88ca0a94c63f0c45d00e3478e5e7fd808fa
Component: engine
 2014-05-01 11:15:07 +10:00
Johannes 'fish' Ziemke
bf9d02ea77 Add notes about git commit messages 
This improves readability of commits a lot and is easy to
follow. I think most people follow those rules already. They are based
on http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 5f00372af2e0aa0ec540830ba575fe83ae16017f
Component: engine
 2014-04-30 19:28:26 +02:00
Tianon Gravi
0bfbe83abf Resync the DCO text with upstream at http://developercertificate.org/ 
```
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
```

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: aceb10b1e51d1d9016b25fa5275e5a4f02772c57
Component: engine
 2014-03-06 22:32:58 -07:00
Timothy Hobbs
a9b2a5c70f Change mustn't to must not 
mustn't is ambiguous.  It may mean "you don't need to" even when it's not a tag question.  See prose:

http://books.google.cz/books?id=otFPvwLG524C&pg=PA241&lpg=PA241&dq=mustn%27t+trouble+yourself&source=bl&ots=vjgh7n-yyW&sig=LBQAwlZu3GxI5YzvRAXFow4hE1U&hl=en&sa=X&ei=a14XU9vxB4SBywOPz4HwDw&ved=0CDQQ6AEwAg#v=onepage&q=mustn%27t%20trouble%20yourself&f=false

http://www.nytimes.com/books/first/m/maynard-home.html (search for mustn't)

We mustn't argue over grammar.

See: https://github.com/dotcloud/docker/pull/4473

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 47f1609f5c491557237fd998840311cb53d95573
Component: engine
 2014-03-05 17:33:18 +00:00
James Turnbull
69c5fbdfef Added documentation (and some cleanup) around small patch exemptions 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: b187d7ae41a1f946d536b42108ec082541883d26
Component: engine
 2014-03-02 11:43:18 -05:00
Victor Vieux
740924ecab Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco 
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
Upstream-commit: b7c2e8f54e6b76ec321c8c9c1f41dbc8b7c66a4e
Component: engine
 2014-02-17 12:28:05 -08:00
Sven Dowideit
afbabaccff Merge pull request #4050 from SvenDowideit/put-back-LGTM 
bring back the explanation of our LGTM process
Upstream-commit: 6b925a49919ae12129e915ce542c7280faf99641
Component: engine
 2014-02-12 10:41:49 +10:00
Sven Dowideit
06def9a48b bring back the explaination of our LGTM process 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 5051b8610d7802db2d479cfba14009552a95789f
Component: engine
 2014-02-11 10:10:50 +10:00
Guillaume J. Charmes
1d05c3f324 Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel 
remove mention of #docker-meeting
Upstream-commit: 105188be2e321bb462edccfdddbeda2a12a74bc9
Component: engine
 2014-02-07 16:28:10 -08:00
unclejack
71b42cf15f update issue filing & PR submission instructions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1f6000eaa0d571d34e2c9207692fb82c4a022061
Component: engine
 2014-02-06 11:06:25 +02:00
Sven Dowideit
5a4e6a3400 remove mention of #docker-meeting 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d43c85961f3378607ace3e05dbab43ab2481699c
Component: engine
 2014-02-05 10:15:22 +10:00
Sven Dowideit
7de51c3acf missing quote quota 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 64426c74f2599799bd39d04a28d43a05af7624a4
Component: engine
 2014-02-04 15:29:47 +10:00
Brandon Philips
28cc283384 fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant 
In 7fb55f77250a9b52b0515a7e655ecc605ae452ca the DCO lost the grant so
change the title back to just DCO.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 8458f99a387ae70cfaa1e43759919fe414c55505
Component: engine
 2014-01-28 13:50:03 -08:00
Sven Dowideit
6e009b9cf4 move the contributing hook into hack, and use curl in the same way as the gofmt above 
and remove the fmt-check one we don't document

tianon tells me they're called GitHub, not Github :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7c55cbd4c9da88ffb4b1a325ba2e5435e337a3af
Component: engine
 2014-01-22 21:31:42 +10:00
Brandon Philips
8ab9083df0 CONTRIBUTING.md: wrap DCO to 78 chars per line 
The DCO is a bit hard to read on Github right now because there is lots
of horizontal scrolling. Reformat it to 78 chars per line like the rest
of the file.

Example: http://imgur.com/LtJEIsl

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: e4af8b2ddc7be8d984762ea3bf91729f85284eb9
Component: engine
 2014-01-09 10:08:52 -08:00
Guillaume J. Charmes
4765401e7e Merge pull request #3530 from creack/update_dco_doc 
Update DCO git hook example
Upstream-commit: eb131250aa7680812f8f7669b8fdfaaf7dbe8431
Component: engine
 2014-01-09 09:23:35 -08:00
Guillaume J. Charmes
19b256d8cc Merge pull request #3527 from keeb/add-dco 
Amend DCO
Upstream-commit: d015d31b1ca7dcd1952c252d479a3ba84ad4c5b5
Component: engine
 2014-01-09 09:23:11 -08:00
Guillaume J. Charmes
f362f40f54 Update DCO git hook example 
Upstream-commit: c3f259754688d7c20cac5b8f8b998a7608f034a8
Component: engine
 2014-01-09 09:02:56 -08:00
Nick Stinemates
35730d58c5 Bump DCO version 
Upstream-commit: 11d61ec77feb743a3eedef7d85a7a751ed09736e
Component: engine
 2014-01-09 08:47:03 -08:00
Nick Stinemates
c876780684 Fix layout 
Upstream-commit: 40c90796e950307804745c5a852cc64d3e53a1a9
Component: engine
 2014-01-09 08:35:47 -08:00
Nick Stinemates
3bde09b0e2 Removed the 5th clause 
Removed clause which states contributions should be relicensed
Upstream-commit: 7fb55f77250a9b52b0515a7e655ecc605ae452ca
Component: engine
 2014-01-09 08:35:06 -08:00
Sven Dowideit
eb832863bb give more specific advice on setting up signing 
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0eb5f233d68e9a6ec6e0643cc17355ac5ffdfe06
Component: engine
 2014-01-08 10:19:44 +10:00
Michael Crosby
ec223aab35 Merge pull request #2091 from keeb/add-dco 
Add Developer Certificate of Origin Text
Upstream-commit: 4b9e475a3d903564e17dba87ec54990967f7f66e
Component: engine
 2014-01-07 10:42:53 -08:00
Nick Stinemates
6bb653314b Remove the @github handle as it generates emails. 
Upstream-commit: 6fe3da9924fc22bd02eba0803abb42b10fc28baf
Component: engine
 2014-01-06 17:21:14 -08:00
Nick Stinemates
29c9c05aae Fix dotCloud to Docker, Inc 
Upstream-commit: 36ab1836f973c62ff543456f1613dec8813d00df
Component: engine
 2014-01-06 12:26:53 -08:00
Nick Stinemates
6d94111ebb Merged with master 
Upstream-commit: 8f382aaecd223210099883bb66d4beb2e1288e10
Component: engine
 2013-12-04 12:40:54 -08:00
Paul Nasrat
055cf4f6b6 Add a proposal step for potential MAINTAINERS. 
Fixes #3014
Upstream-commit: b59dea67679fefcfe9716b855ef906b377d9993d
Component: engine
 2013-12-03 11:04:53 -05:00
Michael Crosby
3abe5b8a85 Add instructions for opening issues on the repository 
Upstream-commit: e4ae44b844a38327ee4288361376299595b1917e
Component: engine
 2013-11-27 10:41:20 -08:00
Nicolas Kaiser
7dd10871ef fix typo in CONTRIBUTING.md 
Upstream-commit: 76c71260f13af3005c2407e2a19a422741b97117
Component: engine
 2013-11-26 16:13:39 +01:00
Ramkumar Ramachandra
8c7ea81910 CONTRIBUTING: wrap a couple of long lines 
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Upstream-commit: cf30b85eb1d3ecbf27c35ea344a5f68934c1bd2b
Component: engine
 2013-11-11 16:21:34 +05:30
Andy Rothfusz
6c0068a0fa Fix #1919 document how to edit and release docs. 
Upstream-commit: cd455ca6fa3a899153880a7b95b9d07762b4c97c
Component: engine
 2013-10-15 15:52:21 -07:00
Paul Nasrat
a0e0dc0bf5 Clarify LGTM process to contributors. 
Upstream-commit: 310a1742604173ac88a052b04f0b117772ab63ff
Component: engine
 2013-10-10 18:32:33 -04:00
Tianon Gravi
d8303ba769 Add devenvironment link to CONTRIBUTING.md 
Upstream-commit: 9a4b0b982393e0612fef70c37a04654ea46b4c1d
Component: engine
 2013-10-08 16:48:19 -06:00
Nick Stinemates
567344fa64 Add Developer Certificate of Origin Text 
We purposely chose to license Docker under the Apache 2.0 license. This is a well-known
license, which is popular for its permissive and flexible properties, while still
encouraging a collaborative community. It also makes certain representations with regard
to contributions, and the rights given to contributors, the project, people who use Docker,
people who modify Docker, etc.

This approach to contributions is inspired by the popular Linux Developer
"Certificate of Origin". This approach makes it simple for new contributors to get started,
and avoids bureaucracy in tracking contributions and contributors.

To indicate accordance, each individual contribution to the Project is signed off by the
developer, using his or her real name, email address, and github handle in the format below:

	Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com>
Upstream-commit: 821a82ac6ceffd7001b80769ba23b81a7e4a81ad
Component: engine
 2013-10-04 14:27:26 -07:00
Solomon Hykes
d9a3a46bf0 hack/MAINTAINERS.md: a maintainer's manual. 
Upstream-commit: 0ef5bcb17d77e575c808003856c7a6ed134b04f2
Component: engine
 2013-09-23 11:26:04 -07:00
James Carr
2cffc404b5 Update for new mailing list 
Upstream-commit: 465d5313c50007460306a17be16f38dfd657b0a4
Component: engine
 2013-08-24 10:26:54 -07:00
Solomon Hykes
17eaf8b8af Improved wording of a maintainer's responsibilities 
Upstream-commit: dc1fa0745f779d8c9a513dea71021d263b89ca5f
Component: engine
 2013-05-28 22:33:48 -06:00
Solomon Hykes
4ba126a045 Fixed formatting of CONTRIBUTING.md 
Upstream-commit: 3bac27f2405c746c068dbe31f8f205472d0f1b03
Component: engine
 2013-05-28 22:26:42 -06:00
Solomon Hykes
52887551f6 Documented who decides what and how. 
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
 2013-05-28 19:39:09 -07:00
Solomon Hykes
f4d5babfe8 De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo. 
Upstream-commit: 326faec6642896954ffbd407eeda7d19da193856
Component: engine
 2013-05-28 14:57:36 -07:00
Jonathan Rudenberg
819ad2b9f0 Expand the contributing guidelines 
Upstream-commit: 321d94b17e0b23754cb8c5858c11bef554ec8279
Component: engine
 2013-04-01 12:35:04 -04:00
John Costa
4950bad777 add contributing guidlines md file 
Upstream-commit: 760736b3f3f289c2dba013aaef385b1e7b555feb
Component: engine
 2013-03-28 20:04:21 -04:00