ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
8709dc3c24
Added env var parsing to volume container paths
...
This commit adds environment variable parsing to the container side
of the volume mapping in configs. The common use case for this is
mounting SSH agent sockets in a container, using code like:
volumes:
- $SSH_AUTH_SOCK:$SSH_AUTH_SOCK
environment:
- SSH_AUTH_SOCK
Signed-off-by: Jeff Kramer <jeff.kramer@voxmedia.com>
2015-07-02 13:13:38 -05:00
f33f673b49
Allow _.- chars in service names
...
As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 17:57:50 +01:00
8cf84ea552
Fix missing image names
...
These tests were indeed raising a config error, but not for the reason
intended/tested for. I've added in the image name so the config error
raise is correctly testing the Service name.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 17:57:50 +01:00
c8751980f9
Merge pull request #1578 from aanand/fix-migrate-help
...
Fix 'docker-compose help migrate-to-labels'
2015-06-21 17:25:52 -07:00
4f83a18912
Merge pull request #1570 from aanand/fix-build-pull
...
Explicitly set pull=False when building
2015-06-21 17:25:46 -07:00
93372dd665
Fix 'docker-compose help migrate-to-labels'
...
- Fix "No such command" error
- Add text from migration section of install docs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-19 15:43:53 -07:00
c22cc02df5
Don't set network mode when none is specified
...
Setting a value overrides the new default network option.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-19 15:22:13 -07:00
bef0926c58
Explicitly set pull=False when building
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 17:43:16 -07:00
06db577105
Move converge() to a test module, and use a short timeout for tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 17:18:27 -04:00
c24d5380e6
Extend up -t to pass timeout to stop running containers
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-06-14 16:45:28 -04:00
08bc4b830b
Fix volume binds de-duplication
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-12 16:57:22 -04:00
b9c502531d
Possible division by zero error when pulling an image - fixes #1463
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-05-26 15:34:34 -07:00
b0cb31c186
Use 'top' instead of 'sleep' as a dummy command
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 16:24:29 +01:00
ef4eb66723
Implement smart recreate behind an experimental CLI flag
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-18 18:39:18 +01:00
62059d55e6
Add migration warning and option to migrate to labels.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:55:12 -04:00
ed50a0a3a0
Resolves #1066 , use labels to identify containers
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:47:26 -04:00
417d9c2d51
Use individual volumes for recreate instead of volumes_from
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-11 13:01:43 -04:00
df87bd91c8
Added devices configuration option
...
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
2015-05-11 10:50:58 -05:00
6829efd4d3
Resolves #874 , Rename instead of use an intermediate.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-07 21:53:41 -04:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
7e0ab0714f
Merge pull request #1344 from dnephin/fix_pull_with_sha
...
Support image with ids instead of names
2015-04-29 16:46:34 +01:00
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
3dd860f0ba
Fix #923 , support image with ids instead of names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-29 10:13:18 -04:00
855855a0e6
Fix for #1350 , nonexisting build path in parent section causes extending section to fail
...
Signed-off-by: Timothy Van Heest <timothy.vanheest@gmail.com>
2015-04-27 10:55:30 -04:00
89789c54ad
Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files
...
Add parent directories search for default compose-files
2015-04-24 13:12:24 -04:00
e6ec76161d
Merge pull request #1293 from mchasal/1224
...
1224: Check that image or build is specified.
2015-04-21 15:19:11 -04:00
b317071cf3
Merge pull request #1205 from josephpage/run-rm-restart
...
[cli] run --rm overrides restart: always
2015-04-21 15:48:43 +01:00
24a6c240fc
Testcase for #1224 , check that image or build is specified
...
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
2015-04-15 21:38:24 +00:00
15b763acdb
Fix for #1224 , check that image or build is specified
...
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
2015-04-15 02:03:02 +00:00
ceff5cb9ca
Add parent directories search for default compose-files
...
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946 .
Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
2015-04-09 22:36:47 +00:00
fd568b389d
Fix home directory and env expansion in volume paths
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-07 16:23:45 +01:00
0b48e137e8
add unit tests for run --rm with restart
...
Signed-off-by: Joseph Page <joseph.page@rednet.io>
2015-04-07 10:18:25 +02:00
8584525e8d
Interpret 'build:' as relative to the yml file
...
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.
* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)
Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
2015-03-31 18:47:26 -03:00
907918b492
Merge multi-value options when extending
...
Closes #1143 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-31 15:30:59 -04:00
2a415ede08
When extending, `build` replaces `image` and vice versa
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-30 17:14:19 -04:00
fa2fb6bd38
[pep8] flake8 run for everything, fix items from this change
...
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
2015-03-25 23:15:34 -07:00
f9ea5ecf40
[pep8] make test files and config files pep8 valid
...
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
2015-03-25 20:20:38 -07:00
35c6e0314c
Fix volume merging when there's no explicit host path
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-24 13:26:36 -07:00
276e43ca6b
Fix service dict merging when only one dict has a volumes key
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-24 13:26:36 -07:00
37efdb1f8b
Make volume host paths relative to file, merge volumes when extending
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
4c582e4352
Implement `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
528bed9ef6
Fix environment resolution
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:22:28 +00:00
4ecf5e01ff
Extract YAML loading and parsing into config module
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:21:58 +00:00
25c70c2af4
Merge pull request #1076 from gilclark/master
...
Make volumes_from and net containers first class dependencies
2015-03-13 11:46:13 +00:00
86b723e227
Provide user override option on command line
...
Allows overriding a user on the command line from the one specified in
the docker-compose.yml
The added tests verify that a specified user overrides a default
user in the docker-compose.yml file.
Based on commit f2f01e207b
2015-03-11 00:11:31 -04:00
95f4e2c7c3
Make volumes_from and net containers first class dependencies and
...
assure that starting order is correct. Added supporting unit and
integration tests as well.
Signed-off-by: Gil Clark <gilclark1@gmail.com>
2015-03-06 13:30:56 -08:00
f47431d591
Resolves #927 - fix merging command line environment with a list in the config
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-03-02 10:23:43 -05:00
8f38b28816
Use docker-py 1.0.0
...
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
2015-03-02 13:11:02 +01:00
bc1f6c97d8
Merge pull request #898 from aanand/support-fig-yml
...
Support fig.yml
2015-01-29 13:47:49 -05:00
7c087f1c07
Support fig.y(a)ml and show a deprecation warning
...
Closes #864
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-29 13:14:44 -05:00
9bc7604e0e
Make sure we're testing uppercase directories properly
...
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-28 17:19:27 -05:00
de07e0471e
Show a nicer error when the env file doesn't exist
...
Closes #865
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-28 16:20:01 -05:00
2af7693e64
WIP: rename Fig to Compose
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
cbd3ca07c4
Handle Swarm-style prefixed names in Container.from_ps()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 20:38:06 +00:00
edb6b24b8f
Handle Swarm-style prefixed names in Service.containers()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 20:38:06 +00:00
608f29c7cb
Unit tests for Service.containers() and get_container_name()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 20:38:06 +00:00
2dd1cc80ca
Revert "Merge pull request #711 from dnephin/fix_volumes_on_recreate"
...
This reverts commit 55095ef48872095f54b2
2015-01-20 12:03:03 -08:00
7eb476e61d
Resolves #447 , fix volume logic for recreate container
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-01-14 16:20:59 -05:00
4827e60641
Merge pull request #568 from Aigeruth/fix/project_name
...
Convert project_name to lowercase
2015-01-12 16:23:09 +00:00
3056ae4be3
Add a no-build option to fig up, to save time when services were already freshly built.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-12-31 13:47:24 -05:00
5b777ee5f1
Cleanup service unit tests and restructure some service create logic.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-12-31 13:39:41 -05:00
8f8e322de2
Include image name for env_file tests.
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
2014-12-11 14:25:26 -08:00
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
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
3c0f297ba6
Some minor cleanup from yelp/fig
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
2014-12-11 10:08:39 -08:00
98b6d7be78
Add support for 'env_file' key
...
Signed-off-by: Ben Langfeld <ben@langfeld.me>
2014-12-08 23:42:09 +00:00
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
9813a8d5be
Merge pull request #562 from tjrivera/insecure-registry
...
Allow dependent image pull from insecure registry
2014-10-22 18:45:03 +01:00
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
c838f7da18
Convert project_name to lowercase
...
Signed-off-by: Gabor Nagy <mail@aigeruth.hu>
2014-10-21 13:40:19 +02:00
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
431fdaa0f1
Merge pull request #490 from LuminosoInsight/insecure-pull
...
Allow pulls from an insecure registry
2014-10-01 10:52:54 -07:00
3408e0d463
Add unit test for Service.pull
...
Signed-off-by: Moss Collum <mcollum@luminoso.com>
2014-10-01 11:09:19 -04:00
267be12bb2
Merge pull request #456 from dnephin/volumes_from_service
...
Fix volumes_from a service with no containers
2014-09-30 18:33:39 -07:00
ec5c864cc7
Merge pull request #460 from dnephin/fix_tests_for_docker_1.1
...
Fix test failures on docker 1.1.2
2014-09-30 17:52:38 -07:00
fac49b62b6
Support setting project name from the environment.
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
2014-09-29 18:01:08 -04:00
e0b0801e87
Do less work during integration testing.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-09 22:00:21 -04:00
dbd723659b
Add container.get() which removes the duplication of container.inspect() in every property, and provides a nicer interface for querying container data.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-09 20:59:28 -04:00
7fd37c89b9
Remove fig.packages replace with real deps.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-05 11:44:49 -07:00
f5d43b6452
Resolves #455 - volumes_from a service with no containers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-04 22:21:49 -04:00
c48ee5caef
Add a new fig command for retrieving the locally bound port of a service.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-04 22:09:12 -04:00
24044fa704
Some additional validation for container ports, and a couple extra test cases.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-31 02:00:58 -04:00
07fa169fd2
Resolves #260 , #301 and #449
...
Adds ~ support and ro mode support for volumes, along with some additional validation.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-31 02:00:52 -04:00
294453433d
Remove extra calls to docker server.
...
Fix broken integration tests
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-10 11:24:20 -04:00
df7c2cc43f
Resolves #369 , add verbose output on --verbose flag
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-09 21:05:54 -04:00
69c241ba12
Enable monochrome output in the 'up' and 'logs' commands
...
Some systems, like Jenkins or other build servers, cannot correctly
render ANSI color codes. The '--no-color' option enables monochrome
output in the 'up' and 'logs' commands to improve readability in those
systems.
Signed-off-by: Tim Freund <tim@freunds.net>
2014-08-08 16:15:27 -04:00
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
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
779f4bda01
Fix cli for python 2.6
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-07-15 13:07:46 -07:00
91fe414522
Fix regression of default behaviour in Command.project_name
...
Needed an `os.abspath` in there. Added more tests, too.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-14 11:32:10 -07:00
e9c2f2c5fb
Default project_name to dirname of fig.yml
...
Signed-off-by: Ryan Brainard <brainard@heroku.com>
2014-07-12 23:38:20 -07:00
699bbe9ca2
Split the domainname out of qualified hostnames.
...
Docker doesn't like it when a fully qualified hostname is passed in
the `hostname` parameter. When an FQDN is provided with `-h` the
official CLI puts the first component in `hostname` and the rest in
`domainname`. This change replicates that behavior when the user
specifies an FQDN in `hostname` in their `fig.yml`.
Signed-off-by: Sam Hanes <sam@maltera.com>
2014-07-10 20:18:09 -07:00
d04b1724ec
Merge pull request #236 from rail44/feature-support-volumes-from
...
Support volumes_from option
2014-07-02 10:48:11 +01:00
e5916b2fae
Support volumes_from option
...
Signed-off-by: Satoshi Amemiya <rail.sky@gmail.com>
2014-07-02 13:27:54 +09:00
4f7cbc3812
Support for host address in port bindings ( Closes #267 )
2014-06-27 15:07:22 +01:00
256dccc554
Merge pull request #268 from orchardup/update-docker-py-0.3.2
...
Update to docker-py 0.3.2
2014-06-25 14:16:48 +01:00
d0f65906ed
Update to docker-py 0.3.2
...
From 59ced5700c
2014-06-25 11:56:20 +01:00
95aa61cfe5
Merge pull request #246 from d11wtq/feature/auto_start
...
Feature: `fig up` and `fig run` now start linked containers (closes #31 ).
2014-06-24 14:46:47 +01:00
247691ca44
Remove auto_start option from fig.yml.
...
This option is redundant now that services can be started along with links.
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-21 10:39:36 +00:00
d0b5bcf26a
Pass byte strings straight through LogPrinter
2014-06-18 14:51:13 +01:00
262248d8a6
Firm up tests for split_buffer
2014-06-18 14:51:13 +01:00
1b5bf6e12a
Merge remote-tracking branch 'upstream/master' into feature/auto_start
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
Conflicts:
tests/fixtures/simple-figfile/fig.yml
tests/unit/project_test.py
2014-06-12 22:05:51 +00:00
3a342fb25d
Use busybox in fixtures, instead of ubuntu
...
Signed-off-by: d11wtq <chris@w3style.co.uk>
2014-06-11 10:25:50 +00:00
5d92f12f8e
Add unit tests for include_links in get_services()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:48 +00:00
22c531dea7
Add unit tests for Project.get_services()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:44 +00:00
0c12db06ec
Move 'auto_start' option default to Service and add unit tests
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:44 +00:00
10725136d8
Add tests for names on containers
2014-04-29 09:20:29 +01:00
ca7151aeb1
Split tests into unit and integration
2014-04-25 22:58:21 +01:00
Daniel Nephin
Jeff Kramer
Mazz Mosley
Aanand Prasad
Travis Thieman
Todd Whiteman
delbert@umn.edu
Timothy Van Heest
Michael Chase-Salerno
Aleksandr Vinokurov
Joseph Page
Moysés Borges
akoskaaa
Ian VanSchooten
Gil Clark
Zoltan Nagy
Daniel Nephin
Ben Firshman
Ben Langfeld
Andrew Burkett
Tyler Rivera
Gabor Nagy
Moss Collum
Tim Freund
Chris Corbyn
Ryan Brainard
Sam Hanes
Satoshi Amemiya
Mark Steve Samson