dae451019b
Merge pull request #1099 from aanand/fix-env-file-resolution
...
Fix env file resolution
2015-03-13 16:49:10 +00:00
3c8ef6a94c
Fix Project.up() tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:51:26 +00: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 f2f01e207b491866349db7168e3d48082d7abdda by @chmouel
Signed-off-by: Ian VanSchooten <ian@badgelabsllc.com>
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
8610adcaf3
Merge pull request #997 from abesto/use-latest-docker-py
...
Use docker-py 1.0.0
2015-03-02 14:15:18 +00:00
8f38b28816
Use docker-py 1.0.0
...
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
2015-03-02 13:11:02 +01:00
db3b4731cd
Merge pull request #1044 from usrenmae/py3-compat
...
Move several steps closer to python3 compatibility
2015-03-02 12:08:39 +00:00
f1fc1d7a16
Move several steps closer to python3 compatibility
...
Signed-off-by: Igor Ch <usrenmae@gmail.com>
2015-02-28 23:26:20 +02:00
fa195bc829
Add -f flag as option on rm.
...
Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>
2015-02-27 07:24:43 +00: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
6c45b6ccdb
Make sure we're testing blank lines and comments in env files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-28 16:18:02 -05:00
1476027410
Fix test for image-declared volumes
...
A stray 'fig' got lost in the merge post-rename, meaning the containers
weren't being cleaned up properly.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-27 14:46:58 -05:00
620e29b63f
Rename binary to docker-compose and config file to docker-compose.yml
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00: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
17a8a7be4b
(Failing) test for preservation of volumes declared in images
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 20:16:18 +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
26f45efea2
Remove unused intermediate_container from return value.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-01-12 22:16:54 -08:00
4827e60641
Merge pull request #568 from Aigeruth/fix/project_name
...
Convert project_name to lowercase
2015-01-12 16:23:09 +00:00
aa0c43df96
Add cpu_shares option in fig.yml
...
This options maps exactly the docker run option with the same name.
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-01-11 20:10:48 +01:00
3ee8437eaa
Fix the failing test.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-01-08 10:55:40 -05:00
b903217a4a
Merge pull request #544 from LuminosoInsight/external-links
...
Allow links to containers outside of the project
2015-01-08 10:39:00 -05: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
4257707244
Accept an external_links list in the service configuration dictionary to create links to containers outside of the project
...
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
2014-12-30 15:31:33 -05:00
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
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
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
5182bd0968
Add dns_search support in yml config
...
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
2014-12-15 16:37:31 +03:30
05544ce241
Stronger integration tests for volume binds
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-12-12 17:53:57 -08:00
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
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
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
e9d946b038
Merge pull request #594 from popox/restart-option
...
Add restart option to Fig.
2014-12-08 08:43:27 -08:00
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
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
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
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
38a3ee8d63
Use upstream dockerpty 0.3.2
...
This reverts commit 60411e9f05Closes #556
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Conflicts:
requirements.txt
setup.py
2014-11-04 10:23:42 +00:00
782a46fd60
Fixes #602 Allowing `help $cmd` with no figfile
...
Signed-off-by: Michael A. Smith <michael@smith-li.com>
2014-11-02 06:22:16 -05: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
60411e9f05
Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7
...
Include TLS fixes and relative imports:
c8b4935534
2014-10-16 16:24:39 +01:00
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
1820306d0a
Merge pull request #529 from chmouel/override-environement
...
Allow overriding environements on command line
2014-10-14 11:27:20 +01:00
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
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
431fdaa0f1
Merge pull request #490 from LuminosoInsight/insecure-pull
...
Allow pulls from an insecure registry
2014-10-01 10:52:54 -07:00
62b9c64311
Add support for the --entrypoint option of docker run
...
Signed-off-by: Satoru Logic <satorulogic@gmail.com>
2014-10-01 09:28:28 -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
537d435a28
Fix race condition in cli_test.py
...
We weren't waiting for the build to finish, causing the rest of the test
to occasionally fail when looking for the image.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-09-26 11:42:16 -07:00
d978787fcc
Merge pull request #439 from dnephin/faster_integration_tests
...
Faster integration testing
2014-09-24 17:34:52 -07:00
fc4c35e977
Merge pull request #411 from Banno/fig-pull
...
adding "fig pull [SERVICE]" to pull service images
2014-09-10 23:57:20 +01:00
e0b0801e87
Do less work during integration testing.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-09 22:00:21 -04:00
71e7103662
Fix some tests failing with docker 1.1.2 and add a comment to recreate_container() explaining what it does.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-09 20:59:28 -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
ce8ef23c09
Merge pull request #393 from marksteve/restart
...
Implement restart command (Closes #98 )
2014-09-08 17:47:08 +01: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
2827786886
Merge pull request #364 from docker/non-numeric-link-alias
...
Non-numeric link alias
2014-09-04 20:39:18 +01: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
e51851c884
adding "fig pull [SERVICE]" to pull service images
...
Fixes #158
Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
2014-08-15 09:24:15 -05:00
e224c4caa4
Add integration test for restart command
...
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
2014-08-13 10:01:27 +08: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
62a4d214e8
Default link alias which is just the service name
...
Closes #37 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-08-08 13:05:42 -07: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
262efce43e
Fix test regression introduced in ed80576236
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-24 11:47:39 -07:00
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
140ced6a3b
Fix and document `dns:` option
...
Closes #240 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-17 18:11:50 -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
7fb43cc85f
Merge pull request #283 from d11wtq/feature/optional-command
...
Make fig run COMMAND parameter optional.
2014-07-14 18:33:18 +01: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
ef2fb77c1d
Make fig run COMMAND parameter optional.
...
This behaves more like the native docker client, where the absence of a
command means docker runs the CMD in the Dockerfile. If a command is
defined in fig.yml this is used instead.
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-07-12 02:30:34 +00:00
89341013a0
Fix volumes_from container
...
Closes #311 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-11 16:39:23 -07:00
b573b87a92
Fix race condition in recreate containers
...
Container might have stopped between checking `is_running` and
calling `stop()`, which then threw an exception.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-11 14:53:46 -07:00
Ben Firshman
Aanand Prasad
Ian VanSchooten
Gil Clark
Daniel Nephin
Zoltan Nagy
Igor Ch
KingsleyKelly
Daniel Nephin
Christophe Labouisse
Jason Bernardino Alonso
Mohammad Salehe
Stephen Quebe
Ben Langfeld
Tyler Fenby
Paul B
Andrew Burkett
Raúl Cumplido
Michael A. Smith
Tyler Rivera
Gabor Nagy
Chmouel Boudjnah
satoru
Moss Collum
Luke Amdor
Mark Steve Samson
Tim Freund
Chris Corbyn
Ryan Brainard