tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
816 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

816 Commits

Author SHA1 Message Date
Ben Firshman 9a04ae0ddf Merge pull request from TFenby/capabilities 
Add capability add/drop introduced in Docker 1.2
 2014-12-08 21:24:02 +00:00
Tyler Fenby 5c58180538 Add capability add/drop introduced in Docker 1.2 
Signed-off-by: Tyler Fenby <tylerfenby@gmail.com>
 2014-12-08 12:32:52 -05:00
Ben Firshman 429a3feabc Merge pull request from dtenenba/master 
interpolate service_name in error message
 2014-12-08 08:49:54 -08:00
Ben Firshman 1033439e63 Merge pull request from bersace/master 
Respect --allow-insecure-ssl option for dependencies
 2014-12-08 08:46:30 -08:00
Ben Firshman e9d946b038 Merge pull request from popox/restart-option 
Add restart option to Fig.
 2014-12-08 08:43:27 -08:00
Étienne BERSAC 4e8337c168 Respect --allow-insecure-ssl option for dependencies 
Signed-off-by: Étienne Bersac <etienne.bersac@novapost.fr>
 2014-12-04 11:45:36 +01:00
Dan Tenenbaum e34a62956e interpolate service_name in error message when service has no configuration options. 
Signed-off-by: Dan Tenenbaum <dtenenba@fhcrc.org>
 2014-12-03 09:44:35 -08:00
Daniel Nephin 65ae22e79a Merge pull request from raulcd/604_support_reloading_containers 
Add signal in the kill CLI commando to send a specific signal to the service
 2014-11-13 10:28:14 -05:00
Paul B 04da6b035e Add restart option to Fig. Related to 
Signed-off-by: Paul Bonaud <paul@bonaud.fr>
 2014-11-08 12:10:11 +01:00
Daniel Nephin d3e94f2caf Merge pull request from drewkett/multiple_port_mappings 
Support multiple port bindings for same internal port
 2014-11-07 11:28:27 -08:00
Andrew Burkett 4f6d02867b Move to build_port_bindings(). Added Tests 
Signed-off-by: Andrew Burkett <burkett.andrew@gmail.com>
 2014-11-06 18:11:09 -08:00
Andrew Burkett f98323b79e Support multiple port mappings for same internal port 
Signed-off-by: Andrew Burkett <burkett.andrew@gmail.com>
 2014-11-06 16:29:39 -08:00
Aanand Prasad 3f4b16181d Merge pull request from bfirsh/make-dnephin-a-maintainer 
Make @dnephin a maintainer
 2014-11-05 10:58:50 +00:00
Aanand Prasad 5dde2a2498 Merge pull request from bfirsh/ship-1.0.1 
Ship 1.0.1
 2014-11-05 10:57:53 +00:00
Ben Firshman 06a1b32c12 Make @dnephin a maintainer 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-05 09:47:48 +00:00
Ben Firshman 46433c70b6 Ship 1.0.1 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-04 14:12:48 +00:00
Aanand Prasad 9260603149 Merge pull request from bfirsh/use-upstream-dockerpty 
Use upstream dockerpty 0.3.2
 2014-11-04 12:59:01 +00:00
Raúl Cumplido 9abdd337b5 Add signal in the kill CLI commando to send a specific signal to the service 
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
 2014-11-04 12:22:39 +00:00
Ben Firshman 8773f51583 Don't select stdin when interactive=False 
Patch from https://github.com/d11wtq/dockerpty/pull/24

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-04 10:25:27 +00:00
Ben Firshman 38a3ee8d63 Use upstream dockerpty 0.3.2 
This reverts commit 60411e9f05.

Closes 

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
 2014-11-04 10:23:42 +00:00
Aanand Prasad cb275b8633 Merge pull request from npeters/fix-insecure-registry 
fix insecure parameter
 2014-11-03 14:17:43 +00:00
Aanand Prasad 604b370bb4 Merge pull request from kojiromike/602-no-help-without-figfile 
Fixes  Allowing `help $cmd` with no figfile
 2014-11-03 11:27:58 +00:00
Michael A. Smith 782a46fd60 Fixes Allowing `help $cmd` with no figfile 
Signed-off-by: Michael A. Smith <michael@smith-li.com>
 2014-11-02 06:22:16 -05:00
Aanand Prasad 1bd3d0dd77 Merge pull request from kevinsimper/patch-1 
Update wordpress url on wordpress example
 2014-10-31 12:23:30 +00:00
Nicolas Peters b64ea85916 fix insecure parameter 
Signed-off-by: Nicolas Peters <peters.nico@gmail.com>
 2014-10-28 00:05:17 +01:00
Kevin Simper b47ab2b0f6 Update wordpress url on wordpress example 
The old url gave a 302 and wordpress 4.0 has also been released.
 2014-10-24 23:50:06 +02:00
Aanand Prasad 11280e4f30 Merge pull request from bfirsh/add-dockerignore 
Add .dockerignore
 2014-10-24 11:59:01 +01:00
Aanand Prasad a83876da09 Merge pull request 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 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 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 .
 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 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  Provides the ability to pull from an insecure registry by passing --allow-insecure-ssl. This commit extends the work done in  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 from bfirsh/fix-google-analytics-code 
Fix Google Analytics code
 2014-10-22 12:48:45 +01:00
Aanand Prasad 67d4b7c587 Merge pull request 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 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 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 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 , Resolves - 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 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 from aanand/credit-1.0-contributors 
Credit 1.0 contributors
 2014-10-17 15:43:34 +01:00