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
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
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
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
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
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
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
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
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
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
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
44a91e6ba8
Resolve environment without values to values on host
...
For parity with the Docker CLI, allow environment variables without
values to be automatically resolved to their values on the host.
Signed-off-by: Ryan Brainard <brainard@heroku.com>
Conflicts:
tests/integration/service_test.py
2014-07-11 10:18:05 -07:00
d83bdd5164
Change working dir through fig.yml
...
Closes #144
Signed-off-by: Alexey Lebedeff <binarin@gmail.com>
2014-07-10 21:22:45 +04:00
944e15fa65
Stop `fig run` starting everything when a service has no links
...
This was thanks to the semantics of project.up(), which starts everything
if you pass it an empty list of service names. (That logic should
probably be moved out to main.py.)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-02 11:51:12 +01: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
3c48884dbb
Update dockerpty; stub it out in tests
...
Its current behaviour occasionally causes tests to hang; until this is
resolved, we'll stub it out. We weren't testing the output of 'run'
anyhow (though we should be).
2014-06-27 14:41:36 +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
0fc9cc65d1
Rename '--only' => '--no-deps'
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-21 10:30:36 +00:00
6b8044e92c
add net param support
...
Signed-off-by: Peter Flood <info@whywouldwe.com>
2014-06-19 11:57:55 +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
6e485df084
Rename --no-links to --only
...
Signed-off-by: d11wtq <chris@w3style.co.uk>
2014-06-11 10:50:45 +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
1d1e23611b
Rename --keep-old to --no-recreate
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:51 +00:00
ab1fbc96c3
Move keep_old check up into Project
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:50 +00:00
a04143e2a7
Remove unused: from __future__ import unicode_literals.
...
This is not being used and it confuses the Command class. Rather
than try to fix the Command class, I've taken the pragmatic
approach and removed the trigger that confuses it.
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:50 +00:00
6c4299039a
Write integration tests for `--keep-old` in the CLI
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:49 +00:00
655d347ea2
Write integration tests on new `fig run` linking behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:49 +00:00
94a3164248
Re-add missing import for patch
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:49 +00:00
18728a64b9
Write tests for --no-links changes to `fig up`
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:48 +00:00
d8b0fa294e
Add integration tests for Project.up() w/ start_links and keep_old
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:48 +00:00
a6c8319b5d
Add integration tests for Service.recreate_containers() with keep_old
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:48 +00:00
13a296049b
Update cli integration test for 'auto_start' behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:45 +00:00
dfc74e2a77
Write integration test for 'auto_start' behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-09 01:31:44 +00:00
ca7151aeb1
Split tests into unit and integration
2014-04-25 22:58:21 +01:00
Steven Dake
Aanand Prasad
akoskaaa
funkyfuture
Ben Firshman
Ian VanSchooten
Gil Clark
Igor Ch
KingsleyKelly
Daniel Nephin
Daniel Nephin
Christophe Labouisse
Jason Bernardino Alonso
Mohammad Salehe
Stephen Quebe
Ben Langfeld
Tyler Fenby
Paul B
Raúl Cumplido
Michael A. Smith
Chmouel Boudjnah
satoru
Luke Amdor
Mark Steve Samson
Ryan Brainard
Chris Corbyn
Alexey Lebedeff
Satoshi Amemiya
j0hnsmith