Commit Graph

723 Commits

Author SHA1 Message Date
Alexander Holbreich 6797a322b5 Changing to stable debian (wheezy).
Therefore it compiles agains more common version of GLIBC.

Now works out of the box on Debian wheezy, centos:centos6 and other stable
Of course it works on new distributions. Tested with:
    debian:jessie and
    ubuntu:14.04

Signed-off-by: Alexander Holbreich <alexander@holbreich.org>

Conflicts:
	Dockerfile
2014-09-30 16:25:13 -07:00
Aanand Prasad e04c5cb52c Merge pull request #506 from bfirsh/make-test-script-use-docker
Make script/test use docker
2014-09-30 15:16:07 -07:00
Ben Firshman a3f70a9f64 Make script/test use Docker
Really easy to run entire test suite with Docker now. Also switch
Wercker to use the same script.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-30 13:51:42 -07:00
Ben Firshman f407504679 Remove old Travis files
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-30 13:47:47 -07:00
Aanand Prasad 253b245a1c Merge pull request #492 from dnephin/project_name_from_env
Support setting project name from the environment
2014-09-29 15:32:29 -07:00
Daniel Nephin fac49b62b6 Support setting project name from the environment.
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
2014-09-29 18:01:08 -04:00
Ben Firshman 92ae5af019 Merge pull request #501 from aanand/fix-build-error
Fix race condition in cli_test.py
2014-09-28 04:54:08 +01:00
Aanand Prasad 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
Aanand Prasad 5d76d183b4 Merge pull request #483 from dnephin/sort_containers_by_name_in_ps
Sort containers in ps output by name
2014-09-26 10:18:08 -07:00
Aanand Prasad d4b7ed94e1 Merge pull request #499 from bfirsh/wercker-badge
Add wercker badge to readme
2014-09-25 11:37:03 -07:00
Aanand Prasad d978787fcc Merge pull request #439 from dnephin/faster_integration_tests
Faster integration testing
2014-09-24 17:34:52 -07:00
Ben Firshman 3535270ef0 Add wercker badge to readme
And removed PyPi badge because who cares.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-24 14:19:27 -07:00
Ben Firshman b9eb55a225 Merge pull request #498 from bfirsh/mieciu-patch-1
Fix the broken URL
2014-09-24 21:53:57 +01:00
mieciu 35b217a0a4 Fix the broken URL
It was not redirecting to the proper page

Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
2014-09-24 13:52:08 -07:00
Aanand Prasad c37dc558fb Merge pull request #497 from bfirsh/wercker
Add wercker.yml
2014-09-24 10:51:56 -07:00
Ben Firshman 7a8f5e10fd Add wercker.yml
Changed Dockerfile to run as root so it has access to
/var/run/docker.sock.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-23 10:40:51 -07:00
Daniel Nephin 192fce9153 Resolves #43 - sort containers in ps output by name, so services are grouped together.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-14 16:06:23 -04:00
Ben Firshman 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
Luke Amdor 648c89768b adding 'fig pull' to cli docs
Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
2014-09-10 16:20:14 -05:00
Daniel Nephin e0b0801e87 Do less work during integration testing.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-09 22:00:21 -04:00
Aanand Prasad 6b221d5687 Merge pull request #477 from bfirsh/docker-py-0.5.0
Upgrade to docker-py 0.5.0
2014-09-08 14:20:12 -07:00
Ben Firshman ce8ef23c09 Merge pull request #393 from marksteve/restart
Implement restart command (Closes #98)
2014-09-08 17:47:08 +01:00
Ben Firshman b0159e5100 Upgrade to docker-py 0.5.0
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-08 09:23:01 -07:00
Ben Firshman ee6bb9a252 Merge pull request #475 from bfirsh/fix-missing-six-package
Fix missing six package
2014-09-06 02:20:55 +01:00
Ben Firshman 866050937a Fix missing six package
I had some .pyc files kicking around, urgh.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-05 17:19:53 -07:00
Ben Firshman 41ee65b664 Merge branch 'dnephin-replace_packages_with_deps'
Closes #375
2014-09-05 11:55:17 -07:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-05 11:44:49 -07:00
Aanand Prasad 8d3c9dccc5 Merge pull request #402 from dnephin/fig_ports.rebase
Fig port command
2014-09-05 11:09:40 -07:00
Daniel Nephin 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
Ben Firshman 2827786886 Merge pull request #364 from docker/non-numeric-link-alias
Non-numeric link alias
2014-09-04 20:39:18 +01:00
Aanand Prasad 7ad91f3f00 Merge pull request #442 from dnephin/fix_create_container_volumes
Additional validation for container volumes and ports.
2014-09-04 12:12:09 -07:00
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 8157f0887d Fix the return value of get_tty_width() it should return an int.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-25 22:20:07 -04:00
Aanand Prasad 6dab8c1b89 Merge pull request #420 from bfirsh/inline-installation-commands
Collapse install instructions into single line
2014-08-21 17:28:08 -07:00
Ben Firshman 63bd05d40e Collapse install instructions into single line
For maximum copy and paste happiness

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-18 13:36:37 -07:00
Luke Amdor 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
Mark Steve Samson e224c4caa4 Add integration test for restart command
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
2014-08-13 10:01:27 +08:00
Aanand Prasad dc857a7ad5 Merge pull request #404 from bfirsh/validate-dco
Validate DCO on Travis
2014-08-12 11:20:38 -07:00
Ben Firshman aca0e42178 Validate DCO on Travis
Copied straight from Docker, replacing github.com/docker/docker
with github.com/docker/fig in .validate.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-12 10:58:16 -07:00
Ben Firshman 15037ce0e5 Merge pull request #397 from alunduil/master
Exclude tests package from installation.
2014-08-12 18:16:50 +01:00
Mark Steve Samson 9d55e01e2a Implement restart command (Closes #98)
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
2014-08-12 10:07:20 +08:00
Aanand Prasad 8eee2bf913 Merge pull request #396 from dnephin/remove_extra_calls
Remove extra calls, test bug fixes
2014-08-11 11:54:57 -07:00
Alex Brandt 3965db9dff Exclude tests package from installation.
Installing the top-level tests package is asking for conflicts with
other python packages and isn't required to run fig.  This simply lets
find_packages know to ignore tests and any sub-packages.
2014-08-11 09:00:16 -05:00
Daniel Nephin 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
Chris Corbyn 22f897ed09 Merge pull request #370 from dnephin/debug_option
Add a --debug flag for debugging docker calls
2014-08-10 21:36:17 +10:00
Daniel Nephin 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
Aanand Prasad f2bf7f9e0d Merge pull request #384 from timfreund/master
Enable monochrome output in the 'up' and 'logs' commands
2014-08-08 14:55:31 -07:00
Tim Freund 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
Aanand Prasad 59e31ff544 Update docs to remove numeric suffix
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-08-08 13:08:27 -07:00