tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
844 Commits 24 Branches 268 Tags
Commit Graph

844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
c885aaa5f8 ROADMAP.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-12-31 18:10:05 +00:00
Aanand Prasad
70c3676084 Merge pull request #763 from bfirsh/pass-through-detach-to-create-container 
Don't attach stdin and stdout when in detach mode
 2014-12-30 16:05:53 +00:00
Ben Firshman
e89826fe43 Don't attach stdin and stdout when in detach mode 
This is primarily to make it work with Swarm, which checks that
AttachStd{in,out,err} is false when creating containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-30 14:13:36 +00:00
Aanand Prasad
0e172228d1 Merge pull request #485 from squebe/run-service-ports 
Added map service ports option for run command.
 2014-12-19 14:17:57 -08:00
Daniel Nephin
cb1a5e0a24 Merge pull request #476 from salehe/dns-search 
Add dns_search support in yml config
 2014-12-19 10:00:45 -05:00
Mohammad Salehe
3c105c6db2 Fix typo in dns_search documentation 
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
 2014-12-15 16:37:32 +03:30
Mohammad Salehe
5182bd0968 Add dns_search support in yml config 
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
 2014-12-15 16:37:31 +03:30
Daniel Nephin
200c44cff3 Merge pull request #728 from aanand/volume_test 
Stronger integration test for volume binds
 2014-12-13 12:51:22 -05:00
Aanand Prasad
05544ce241 Stronger integration tests for volume binds 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-12-12 17:53:57 -08:00
Stephen Quebe
cc834aa564 Added map service ports option for run command. 
When using the fig run command, ports defined in fig.yml can be mapped
to the host computer using the -service-ports option.

Signed-off-by: Stephen Quebe <squebe@gmail.com>
 2014-12-11 20:30:38 -05:00
Ben Firshman
a5505e7711 Merge pull request #721 from dnephin/fix_broken_tests 
Include image name for env_file tests
 2014-12-12 00:46:41 +00:00
Daniel Nephin
8f8e322de2 Include image name for env_file tests. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 14:25:26 -08:00
Daniel Nephin
64762c9dea Merge pull request #716 from bfirsh/pull-latest-tag-by-default 
Pull latest tag by default
 2014-12-11 15:58:40 -05:00
Ben Firshman
8ebec9a67f Pull latest tag by default 
This was changed in Docker recently:

https://github.com/docker/docker/pull/7759

This means we aren't pulling loads of tags when we only use the
latest.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-11 12:37:04 -08:00
Ben Firshman
45b2712032 Merge pull request #720 from dnephin/upstream_minor_fixes 
Support a timeout on docker client
 2014-12-11 19:28:33 +00:00
Daniel Nephin
3c0f297ba6 Some minor cleanup from yelp/fig 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 10:08:39 -08:00
Ben Firshman
c0123c7477 Merge pull request #717 from bfirsh/rm-containers-in-scripts 
Remove containers in scripts
 2014-12-10 23:26:51 +00:00
Ben Firshman
2a0782c660 Merge pull request #718 from bfirsh/docker-py-0.6.0 
Upgrade to docker-py 0.6.0
 2014-12-09 22:12:05 +00:00
Daniel Nephin
481a8cb7ab Merge pull request #713 from leishman/add-favicon-headers 
Add favicon.ico and links in header
 2014-12-09 14:29:33 -05:00
Ben Firshman
788741025e Upgrade to docker-py 0.6.0 
Force using remote API version 1.14 so Fig is still compatible with
Docker 1.2.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:57:45 -08:00
Ben Firshman
c12d1d73f0 Remove containers in scripts 
So we don't clutter up Docker with loads of stopped containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:49:37 -08:00
Ben Firshman
e794e79209 Merge pull request #665 from benlangfeld/support-env-file 
Support env file
 2014-12-09 18:42:31 +00:00
Ben Langfeld
98b6d7be78 Add support for 'env_file' key 
Signed-off-by: Ben Langfeld <ben@langfeld.me>
 2014-12-08 23:42:09 +00:00
Ben Firshman
a12cf826cd Merge pull request #585 from alunduil/add-tests-to-sdist 
Add tests to sdist.
 2014-12-08 21:34:47 +00:00
Ben Firshman
d18cfa1c98 Merge pull request #661 from bfirsh/add-entrypoint-to-dockerfile 
Add fig as entrypoint to Dockerfile
 2014-12-08 21:32:06 +00:00
Ben Firshman
9a04ae0ddf Merge pull request #623 from TFenby/capabilities 
Add capability add/drop introduced in Docker 1.2
 2014-12-08 21:24:02 +00:00
Alexander Leishman
ab77cef7ab Add favicon.ico and links in header 
Signed-off-by: Alexander Leishman <leishman3@gmail.com>
 2014-12-08 13:04:02 -08: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 #699 from dtenenba/master 
interpolate service_name in error message
 2014-12-08 08:49:54 -08:00
Ben Firshman
1033439e63 Merge pull request #701 from bersace/master 
Respect --allow-insecure-ssl option for dependencies
 2014-12-08 08:46:30 -08:00
Ben Firshman
e9d946b038 Merge pull request #594 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
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
Ben Firshman
bb85e238e0 Add fig as entrypoint to Dockerfile 
A step towards "docker run fig".

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-20 17:23:43 +00:00
Daniel Nephin
65ae22e79a Merge pull request #611 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 #478 
Signed-off-by: Paul Bonaud <paul@bonaud.fr>
 2014-11-08 12:10:11 +01:00
Daniel Nephin
d3e94f2caf Merge pull request #624 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 #618 from bfirsh/make-dnephin-a-maintainer 
Make @dnephin a maintainer
1.0.1 		2014-11-05 10:58:50 +00:00
Aanand Prasad
5dde2a2498 Merge pull request #612 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 #588 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 60411e9f05ac2b9245053491cef7c3cda9e923f1.

Closes #556

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 #591 from npeters/fix-insecure-registry 
fix insecure parameter
 2014-11-03 14:17:43 +00:00
Aanand Prasad
604b370bb4 Merge pull request #606 from kojiromike/602-no-help-without-figfile 
Fixes #602 Allowing `help $cmd` with no figfile
 2014-11-03 11:27:58 +00:00