tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 05:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
791 Commits 20 Branches 280 Tags
Commit Graph

791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Brandt
0150b38b8f Add tests to sdist. 
In order to validate installation it's very convenient to have the tests
as part of the source distribution.  This greatly assists native
packaging that might occur (i.e. Gentoo ebuilds).

Signed-off-by: Alex Brandt <alunduil@alunduil.com>
 2014-11-28 09:37:33 -06:00
Aanand Prasad
11280e4f30 Merge pull request #581 from bfirsh/add-dockerignore 
Add .dockerignore
 2014-10-24 11:59:01 +01:00
Aanand Prasad
a83876da09 Merge pull request #580 from bfirsh/improve-contributing-instructions 
Improve contributing instructions
 2014-10-24 11:43:14 +01:00
Ben Firshman
e66c0452d5 Add .dockerignore 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-23 19:00:44 +01:00
Ben Firshman
899670fc6c Move building binaries instructions 
It's less important than signing your work.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-23 18:31:28 +01:00
Ben Firshman
ea45715a50 Tidied up development environment instructions 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-23 18:30:48 +01:00
Ben Firshman
28f9c8d047 Add TL;DR section to CONTRIBUTING.md 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-23 18:28:17 +01:00
Aanand Prasad
292fe6640e Merge pull request #578 from bfirsh/update-url-in-twitter-button 
Update Twitter button URL
 2014-10-23 16:17:38 +01:00
Ben Firshman
b759b9854a Update Twitter button URL 
I originally left it as orchardup.github.io so the number wouldn't roll
back to 0, but people have been tweeting about fig.sh now.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-23 16:05:11 +01:00
Aanand Prasad
40943d5c81 Merge pull request #533 from bfirsh/mention-configuration-files-on-home-page 
Mention names of config files on home page
 2014-10-23 11:23:33 +01:00
Aanand Prasad
93a0195dc8 Merge branch 'andreagrandi-patch-1' 
Closes #570.
 2014-10-23 11:14:53 +01:00
Andrea Grandi
7f0745d146 Add command line options to the documentation 
Signed-off-by: Andrea Grandi <a.grandi@gmail.com>
 2014-10-23 11:13:40 +01:00
Ben Firshman
9813a8d5be Merge pull request #562 from tjrivera/insecure-registry 
Allow dependent image pull from insecure registry
 2014-10-22 18:45:03 +01:00
Tyler Rivera
491181ec31 Allow dependent image pull from insecure registry 
PR #490 Provides the ability to pull from an insecure registry by passing --allow-insecure-ssl. This commit extends the work done in #490 and adds the ability to pass --allow-insecure-ssl to the up and run commands which will attempt to pull dependent images if they do not exist.

Signed-off-by: Tyler Rivera <riverat2@email.chop.edu>
 2014-10-22 10:57:43 -04:00
Aanand Prasad
e1ad5b1b99 Merge pull request #575 from bfirsh/fix-google-analytics-code 
Fix Google Analytics code
 2014-10-22 12:48:45 +01:00
Aanand Prasad
67d4b7c587 Merge pull request #574 from bfirsh/update-tagline 
Update tagline to match website
 2014-10-22 12:46:16 +01:00
Ben Firshman
98f663bab2 Fix Google Analytics code 
It was not reporting because our URL changed.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-22 12:46:05 +01:00
Ben Firshman
75b3dcf5fd Update tagline to match website 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-22 12:41:01 +01:00
Ben Firshman
deeb6c2236 Merge pull request #567 from aanand/fix-wordpress-guide 
Fix language in Wordpress guide
 2014-10-22 11:31:41 +01:00
Aanand Prasad
e1e2b75691 Fix language in Wordpress guide 
Was still talking about 'environment variables'.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-21 11:44:42 +01:00
Aanand Prasad
392c118bbc Merge pull request #554 from dnephin/more_defensive_stream 
Fix a couple bugs with 1.0 release and Docker 1.3
 2014-10-20 15:10:50 +01:00
Ben Firshman
dbd1e56dd3 Merge pull request #548 from aanand/fix-docker-py-requirement 
Fix docker-py requirement in setup.py
 2014-10-20 10:33:44 +01:00
Daniel Nephin
7544580b4b Resolves #553, Resolves #546 - bug fixes with unit tests 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-18 13:54:10 -04:00
Aanand Prasad
2efb4f5be0 Merge pull request #550 from bfirsh/fix-date-on-change-notes 
Fix date on 1.0.0 change notes
 2014-10-17 15:47:50 +01:00
Ben Firshman
5e8dc6c972 Merge pull request #549 from aanand/credit-1.0-contributors 
Credit 1.0 contributors
 2014-10-17 15:43:34 +01:00
Ben Firshman
23c8ec8930 Fix date on 1.0.0 change notes 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-17 15:43:14 +01:00
Aanand Prasad
bd8affb7aa Credit 1.0 contributors 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-17 14:54:46 +01:00
Aanand Prasad
7a943739cb Fix docker-py requirement in setup.py 
I updated requirements.txt but forgot about setup.py, so the version on
pypi is broken for people who already have docker-py 0.5.0 installed.

Closes #547.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-17 11:17:58 +01:00
Aanand Prasad
6580c5609c Merge pull request #526 from bfirsh/ship-1.0.0 
WIP: Ship 1.0.0
1.0.0 		2014-10-16 18:54:56 +01:00
Ben Firshman
a07c83659d Merge pull request #537 from aanand/tls 
TLS support
 2014-10-16 18:53:59 +01:00
Aanand Prasad
0f58b9f6b4 Update docker-py to 0.5.3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:55 +01:00
Aanand Prasad
fed391a23e Update documentation for TLS and boot2docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:48 +01:00
Ben Firshman
4d1b2f1547 Ship 1.0.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 16:27:13 +01:00
Aanand Prasad
60411e9f05 Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7 
Include TLS fixes and relative imports:

c8b4935534

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 16:24:39 +01:00
Aanand Prasad
b318585f3c TLS support, with same env vars as docker client 
Thanks to @jkingyens for the bulk of the work.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 10:41:26 +01:00
Ben Firshman
1820306d0a Merge pull request #529 from chmouel/override-environement 
Allow overriding environements on command line
 2014-10-14 11:27:20 +01:00
Aanand Prasad
bf1c1b4c17 Merge pull request #534 from bfirsh/use-bin-echo-for-intermediate-container 
Use /bin/echo for intermediate container
 2014-10-10 13:12:33 +01:00
Ben Firshman
352062c2dc Use /bin/echo for intermediate container 
In cases where the service is using a minimal container,
/bin/echo can be created but echo cannot.

See #517

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-10 12:24:00 +01:00
Ben Firshman
d3f88cace5 Mention names of config files on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-10 11:06:49 +01:00
Chmouel Boudjnah
92249364b6 Allow overriding environements on command line 
Add a new command line option -e to override environement variables when
running a service.

Signed-off-by: Chmouel Boudjnah <chmouel@chmouel.com>
 2014-10-09 16:33:41 +02:00
Ben Firshman
872a1b5a5c Merge pull request #523 from aanand/remove-references-to-docker-osx 
Remove references to docker-osx
 2014-10-06 16:05:06 +01:00
Aanand Prasad
b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Aanand Prasad
a5aac7d59e Merge pull request #508 from bfirsh/recommend-boot2docker-in-install-instructions 
Recommend boot2docker in installation instructions
 2014-10-06 13:44:23 +01:00
Ben Firshman
c16f4d4041 Recommend boot2docker in installation instructions 
Fixes #26

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-06 13:14:12 +01:00
Aanand Prasad
d91c458d52 Merge pull request #509 from bfirsh/smarter-binary-urls 
Use uname to generate binary download URL
 2014-10-06 12:35:36 +01:00
Ben Firshman
475a7e19a9 Merge pull request #521 from aanand/clean-up-env-docs 
Clean up environment variable docs
 2014-10-06 12:34:35 +01:00
Aanand Prasad
f43bfaadaa Clean up environment variable docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 11:58:16 +01:00
Aanand Prasad
2680756dd6 Merge pull request #518 from dnephin/env_docs 
Add environment variables to cli.md docs
 2014-10-06 11:36:21 +01:00
Daniel Nephin
837f368361 Add environment variables to cli.md docs. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-03 13:47:54 -04:00
Aanand Prasad
9df5481066 Merge pull request #512 from bfirsh/fix-entrypoint 
Fix fig run entrypoint option
 2014-10-01 15:39:00 -07:00