p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,401 Commits 2 Branches 295 Tags
8e8fff205d3634647ff73ea72dabe5339f0eed0d
Commit Graph

66 Commits

Author SHA1 Message Date
Alex Gaynor
6e22978e11 Replace fast with quickly 
Technically an adverb should be used there :-)
Upstream-commit: 3a1eafb4889041be13f0e4e450b5eaf0ae7938c8
Component: engine
 2014-10-23 11:06:36 -07:00
Fred Lifton
eb59f56bfa Removed James' email address 
Changed email address for abuse reports from James to abuse@
Upstream-commit: 8b40d385b58f118cbda9f62da9cc88f91afd1f26
Component: engine
 2014-10-23 10:54:40 -07:00
Torstein Husebø
cb88e66803 Correct url from github.com/dotcloud/docker{,-py} 
to github.com/docker/docker{,-py}

Signed-off-by: Torstein Husebø <torstein@huseboe.net>
Upstream-commit: 64cb7725381740986022eb4633c8f91be3dd7b4f
Component: engine
 2014-10-22 16:57:39 +02:00
Tibor Vass
b1b27b03fb Merge pull request #7466 from tiborvass/irc-meetings 
Add irc-meetings section in CONTRIBUTING
Upstream-commit: 18a0eba72dfec57b02a799ae064a60a88d6988c9
Component: engine
 2014-08-12 13:36:57 -04:00
Tibor Vass
137daba41a Add irc-meetings section in CONTRIBUTING 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: c58c70b8bdfc4d13faefaab31d2d1539d5478223
Component: engine
 2014-08-12 13:35:14 -04:00
James Turnbull
549f195299 Update CONTRIBUTING.md 
Added link to community guidelines
Upstream-commit: 8891bb52def06aa4fe21af544c6a3a50ecfa9a5b
Component: engine
 2014-08-07 02:23:00 -04:00
Solomon Hykes
4e14138bbc Merge pull request #7186 from jamtur01/community 
Added proposed Docker Community Guidelines
Upstream-commit: 042b642d407fd9f76c7282fb71e1508bd033bfa1
Component: engine
 2014-08-05 15:44:11 -07:00
Tibor Vass
946ba40611 Update CONTRIBUTING.md and test new DCO signature in this commit 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 6b04d597ee759ec72f95f9bde58716eda8495519
Component: engine
 2014-08-01 19:30:58 -04:00
Timothy Hobbs
8dc0828a88 Remove the restriction on multi-user PRs 
This came up in #docker-dev today.  We're not sure exactly why the original restriction was put it place.  It is not well obeyed.  Please comment if you know the origin of the restriction.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 4c282b979b717a28dd7699ad5b124d82b6a99a29
Component: engine
 2014-07-31 22:05:29 +00:00
Solomon Hykes
fabf07b042 Merge pull request #7091 from erikh/rfe 
Update CONTRIBUTING.md with links to sections and `Proposal:` process.
Upstream-commit: 1f2d75774ad1ab67555699fd25c0734061f36a9b
Component: engine
 2014-07-31 12:28:05 -07:00
Erik Hollensbe
5d2d55c083 Update CONTRIBUTING.md with links to sections and RFE process. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 52db7b8cb7d3408753156e8e33766c049bcc3cfe
Component: engine
 2014-07-31 12:18:31 -07:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00
James Turnbull
00689bb343 Added proposed Docker Community Guidelines 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7365225957046cf6364b30c56f3585d9c29098e5
Component: engine
 2014-07-24 11:04:58 -07:00
Solomon Hykes
b8d866ae4d Merge pull request #6885 from tianon/standard-curl-sSL 
Upstream-commit: 781a47e3f37f952630d2bdf4936388aaf52f3707
Component: engine
 2014-07-14 18:39:31 -07:00
Tianon Gravi
e6a7274d4c Standardize "curl" arguments across the repo to be or include "-sSL" 
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9f61e233c6da72f692190f1f5eb672341253f3e7
Component: engine
 2014-07-07 10:35:38 -06:00
James Turnbull
1a0c71351c Minor updates and fixes to the CONTRIBUTING doc 
* Fixed some uses of docker v. Docker
* Formatting and line wrapping.
* Spelling errors and grammar fixes.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: d013b76e10262624c9f8ee05b9877e26eb58b516
Component: engine
 2014-07-02 22:52:56 -04:00
SvenDowideit
c8806a50df I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
 2014-07-03 10:31:56 +10:00
Sven Dowideit
90c80009e3 Add Sockets (-H) list to docker -D info. 
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
 2014-06-24 12:25:17 +10:00
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