62b47224f0
Fix bug where duplicate container is leftover after 'up' fails
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-03 10:46:07 +01:00
ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
77c939b256
Merge pull request #1142 from calou/master
...
Added support of option mac-address
2015-06-17 14:39:00 -07:00
b76ac6e633
Added support to option mac-address
...
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Updated doc
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Fixed LINT errors
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed mac-address entry order in config keys
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed attributes order in docs/yml.md
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
2015-06-17 21:28:17 +02:00
bc14c473c9
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
2015-06-16 10:45:49 -07:00
5b2a0cc73d
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
2015-06-15 10:58:44 -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
60351a8e07
Speed up integration test and make cleanup easier by using labels
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 16:45:28 -04:00
d827809ffb
Use labels to filter containers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 16:45:28 -04:00
a5fd91c705
Fixing docker-compose port with scale ( #667 )
...
Fixes #667 and Closes #735 (taking over it)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-06-10 23:26:33 +02:00
4fd5d58076
Test against Docker 1.7.0 RC2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-10 14:19:36 -04:00
ff151c8ea0
Test that data volumes now survive a crash when recreating
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-09 13:06:09 -04:00
c59c9dd951
Add integration test for service name verification
...
Add a test to make sure NoSuchService is raised if
a bogus service name is given to 'docker-compose logs'.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-06-08 17:04:42 -04:00
db2d02dc0b
Remove Service.start_or_create_containers()
...
It's only used in a single test method.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-08 10:59:03 -04:00
7d2a89427c
Merge pull request #1466 from noironetworks/changing-scale-to-warning
...
Modified scale awareness from exception to warning
2015-06-04 16:21:01 +01:00
ec437313a7
Change kill SIGINT test to use SIGSTOP
...
I think the original intention of the original test was the check that
different signals work, I think. This does this -- it sends a signal
that doesn't cause the container to stop.
Closes #759 . Replaces #1467 .
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-29 11:13:37 +01:00
ae63d35660
Modified scale awareness from exception to warning
...
Signed-off-by: André Martins <martins@noironetworks.com>
2015-05-26 23:59:45 +01:00
1344099e29
Merge pull request #1444 from aanand/migrate-in-dependency-order
...
Migrate containers in dependency order
2015-05-26 17:30:14 +01:00
7da8e6be3b
Migrate containers in dependency order
...
This fixes a bug where migration would fail with an error if a
downstream container was migrated before its upstream dependencies, due
to `check_for_legacy_containers()` being implicitly called when we fetch
`links`, `volumes_from` or `net` dependencies.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:03:06 +01:00
4795fd874f
Fix regression in `docker-compose up`
...
When an upstream dependency (e.g. a db) has a container but a downstream
service (e.g. a web app) doesn't, a web container is not created on
`docker-compose up`.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:01:05 +01:00
0b4d9401ee
Bail out immediately if there are legacy containers
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 11:53:51 +01:00
051f56a1e6
Fix bugs with one-off legacy containers
...
- One-off containers were included in the warning log messages, which can
make for unreadable output when there are lots (as there often are).
- Compose was attempting to recreate one-off containers as normal
containers when migrating.
Fixed by implementing the exact naming logic from before we used labels.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:49 +01:00
b5ce23885b
Split out fetching of legacy names so we can test it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:49 +01:00
0fdb8bf814
Refactor migration logic
...
- Rename `migration` module to `legacy` to make its legacy-ness explicit
- Move `check_for_legacy_containers` into `legacy` module
- Fix migration test so it can be run in isolation
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:09 +01: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
022f81711e
Fixes #1434 , Project.containers with service_names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-20 20:47:34 -04:00
ea7ee301c0
Add security_opt as a docker-compose.yml option
...
Signed-off-by: Logan Owen <lsowen@s1network.com>
2015-05-19 13:47:41 -04: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
28d2aff8b8
Fix teardown for integration tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:44:44 -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
0f2f9db6d8
Merge pull request #1388 from vdemeester/1303-log-driver-support
...
Add support for log-driver as a docker-compose.yml option
2015-05-07 12:00:42 -04:00
f626fc5ce8
Add support for log-driver in docker-compose.yml
...
Closes #1303
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-06 13:18:58 +02:00
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
4bce388b51
Merge pull request #1376 from aanand/fix-build-non-ascii-filename
...
Make sure the build path we pass to docker-py is a binary string
2015-04-30 20:54:21 -04:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
4f366d8355
Make sure the build path we pass to docker-py is a binary string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-30 11:57:46 +01: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
688f82c1cf
Add cpuset config.
...
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-04-26 00:14:52 +08:00
25ee3f0033
Remove extra s from --add-host
...
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312 )
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
2015-04-24 09:21:29 +08:00
8098b65576
Fix when pyyaml has interpreted line as a dictionary
...
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
2015-04-24 09:21:21 +08:00
fb81c37ca6
added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client
...
Signed-off-by: Sam Wing <sampwing@gmail.com>
2015-04-23 21:54:59 +08:00
2291fa2d45
Fix --timeout flag on restart, add tests for stop and restart
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-21 11:59:33 +01:00
4926f8aef6
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
...
Fix vars in volume paths
2015-04-09 14:44:07 +01:00
1d7247b67e
Remove stray print
...
A previous commit introduced a stray print operation. Remove it.
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-08 12:49:37 -07: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
94277a3eb0
Add --pid=host support
...
Allow docker-compsoe to use the docker --pid=host API available in 1.17
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-06 12:44:35 -07: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
83dcceacaf
Fix regression in Dns and DnsSearch settings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-24 16:17:05 -07:00
965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
2015-03-23 15:04:04 -07:00
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -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
eef4bc3917
Specify all HostConfig at create time
...
This is required for Swarm integration: the cluster needs to know
about config like `links` and `volumes_from` at create time so that it
can co-schedule containers.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:14:07 -07:00
4c5a80f253
Change port in ports-composefile to 49152
...
This shall lower the propability to interfere with another service (e.g. the
WebUI of an application) that is running on the machine where tests are run.
Signed-off-by: funkyfuture <funkyfuture@riseup.net>
2015-03-17 00:21:29 +01:00
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 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
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
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
2af7693e64
WIP: rename Fig to Compose
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +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
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
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
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
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
Aanand Prasad
Daniel Nephin
Sébastien Gruchet
Travis Thieman
Vincent Demeester
Dan O'Reilly
Ben Firshman
André Martins
lsowen
delbert@umn.edu
CJ
xuxinkun
Thomas Desvenain
Sam Wing
Steven Dake
akoskaaa
funkyfuture
Ian VanSchooten
Gil Clark
Igor Ch
KingsleyKelly
Daniel Nephin
Christophe Labouisse
Jason Bernardino Alonso
Mohammad Salehe
Stephen Quebe
Ben Langfeld
Tyler Fenby
Paul B
Raúl Cumplido
Michael A. Smith