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

5517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Firshman
406425a6b9 Use official images in rails tutorial 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:54:59 -07:00
Chris Corbyn
b690b0d20e Merge pull request #387 from dnephin/make_ps_work_on_jekins 
tty width on jenkins
 2014-08-08 07:54:00 +10:00
Ben Firshman
796df302dd Use official images on getting started guide 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:50:55 -07:00
Aanand Prasad
1346805bef Merge pull request #391 from bfirsh/repository-move 
github.com/docker/fig
 2014-08-07 14:49:26 -07:00
Ben Firshman
16744bc78b Switch to official images in readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:48:29 -07:00
Ben Firshman
fc3c12ad90 Update repository URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:42:49 -07:00
Ben Firshman
bbcbe9df9f Upload PyPi package manually 
This never worked properly anyway.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:36:49 -07:00
Ben Firshman
1a240f50ae Remove integration tests from Travis 
Orchard is going away and Travis will be able to run these soon
anyway.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:35:22 -07:00
Ben Firshman
47970761c5 Remove Orchard message from readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:19:27 -07:00
Aanand Prasad
df7bc8cbb8 Merge pull request #389 from orchardup/update-irc-channel 
Update IRC channel to be #docker-fig
 2014-08-07 13:43:12 -07:00
Ben Firshman
ba9d744293 Update IRC channel to be #docker-fig 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 13:39:27 -07:00
Aanand Prasad
d5854bb625 Merge pull request #388 from orchardup/dockerize 
Point at Docker website and Docker IRC channel
 2014-08-07 10:16:16 -07:00
Ben Firshman
e5f7690137 Point at Docker website and Docker IRC channel 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 10:15:01 -07:00
Daniel Nephin
b0f398caaa Resolves #386, tty width on jenkins 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-07 12:30:01 -04:00
Aanand Prasad
0a15e7fe9c Merge pull request #378 from orchardup/use-ruby-image-for-rails-tutorial 
Use ruby image for rails docs
 2014-08-06 16:51:04 -07:00
Aanand Prasad
255b9419dd Merge pull request #382 from orchardup/use-official-repositories-in-django-example 
Use official images in Django example
 2014-08-06 16:50:45 -07:00
Aanand Prasad
c63947b5e2 Merge pull request #383 from orchardup/use-official-repos-on-homepage 
Use official repos on home page
 2014-08-06 16:40:48 -07:00
Ben Firshman
b5d1979d58 Use official repos on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:33:31 -07:00
Ben Firshman
94aa097bc3 Use official images in Django example 
Much neater.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:30:27 -07:00
Aanand Prasad
72ce7ce374 Merge pull request #380 from orchardup/use-hostname-for-redis-on-home-page-example 
Use hostname on home page example
 2014-08-06 16:11:44 -07:00
Ben Firshman
6d64f20ad6 Use hostname on home page example 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 15:53:45 -07:00
Ben Firshman
506f54e9c3 Use ruby image for rails docs 
Fixes #376

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 13:42:56 -07:00
Chris Corbyn
90f5eda930 Merge pull request #367 from dnephin/fix_366_python_dependencies 
Don't pin versions in setup.py install_requires
 2014-08-05 08:17:23 +10:00
Daniel Nephin
c0450f7df0 Resolves #366, non-pinned versions in setup.py:install_requires 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-29 17:13:22 -07:00
d11wtq
847ec5b559 Update dockerpty -> 0.2.3 
Signed-off-by: d11wtq <chris@w3style.co.uk>
0.5.2 		2014-07-29 01:17:28 +00:00
Aanand Prasad
09ffa101ed Merge pull request #362 from orchardup/add-flake8-to-test-script 
Add flake8 to test script
 2014-07-28 16:34:07 -07:00
Ben Firshman
01e2b56405 Add flake8 to test script 
For those who don't use tox.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-28 16:27:57 -07:00
Ben Firshman
2f6c763703 Merge pull request #353 from dnephin/add_flake8 
Add flake8
 2014-07-28 22:35:51 +01:00
Ben Firshman
4caf90c581 Merge pull request #361 from orchardup/update-release-process 
Add "update the website" step to release process
 2014-07-28 21:53:35 +01:00
Aanand Prasad
8fdeb46430 Add "update the website" step to release process 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-28 13:27:22 -07:00
Ben Firshman
07c47426ba Merge pull request #358 from orchardup/ship-0.5.2 
Ship 0.5.2
 2014-07-28 21:18:51 +01:00
Aanand Prasad
a6324d6226 Ship 0.5.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-28 13:17:08 -07:00
Daniel Nephin
939406ca9d Run flake8 in travis build 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-27 08:51:36 -07:00
Daniel Nephin
50a24bc3bf Add flake8 and fix errors. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-27 08:51:17 -07:00
Chris Corbyn
0dc55fda45 Merge pull request #322 from dnephin/fix_cli_for_py26 
Fix cli for python 2.6
 2014-07-27 18:35:40 +10:00
Chris Corbyn
dcd8e7863f Update dockerpty. Fixes #352. 2014-07-27 08:17:38 +00:00
Aanand Prasad
ed283fd3df Merge pull request #345 from orchardup/docker-inc 
Docker, Inc.
 2014-07-25 14:31:58 -07:00
Aanand Prasad
393433b702 Merge pull request #347 from orchardup/fix-typo-yml-docs 
Fix typo yml docs
 2014-07-24 14:31:19 -07:00
Ben Firshman
7516b67a14 Add link to docker-osx in yml docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:18:21 -07:00
Ben Firshman
5eac04d8d4 Fix typo in yml docs 
From c09734822e2a6c79a345b6755c79b870f34007e0

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:16:49 -07:00
Ben Firshman
fec41d3567 Merge pull request #288 from saulshanabrook/patch-1 
Add warning for mapping local volumes
 2014-07-24 22:15:49 +01:00
Saul Shanabrook
c09734822e Add warning for mapping local volumes 
Mapping local volumes is not currently supported in boot2docker

https://github.com/boot2docker/boot2docker/issues/413
https://github.com/dotcloud/docker/issues/4023

Signed-off-by: Saul Shanabrook <s.shanabrook@gmail.com>
 2014-07-24 16:37:14 -04:00
Aanand Prasad
94887a28c7 Make sure we support explicit protocols in port bindings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:48:29 -07:00
Aanand Prasad
262efce43e Fix test regression introduced in ed805762368ea5874b3aa26767e7596a1bf9b67a 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:47:39 -07:00
Ben Firshman
99064d17dd Docker, Inc. 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 10:24:17 -07:00
Aanand Prasad
ed80576236 Merge pull request #276 from marksteve/nocache 
Add `--no-cache` option to `fig build` (Closes #152)
 2014-07-23 10:13:47 -07:00
Ben Firshman
5131eaeba0 Merge pull request #335 from orchardup/document-missing-yml-options 
Document missing .yml options
 2014-07-23 03:45:52 +01:00
Aanand Prasad
b559880a80 Document missing .yml options 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-22 15:37:05 -07:00
Mark Steve Samson
7f06d46827 Add test for building with --no-cache 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-07-22 11:40:44 +08:00
Aanand Prasad
e1a0937a61 Merge pull request #330 from orchardup/www.fig.sh 
www.fig.sh
 2014-07-21 16:46:14 -07:00