tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,953 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

111 Commits

Author SHA1 Message Date
Daniel Nephin 284cda087e Add missing merge for release branch. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin 558098d322 Add a script to generate contributor list. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin 709bd9c363 Bump 1.5.0rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 12:59:31 -04:00
Aanand Prasad d5f5eb1924 Enable use of Docker networking with the --x-networking flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 11:19:43 -04:00
Daniel Nephin f228173660 Print docker version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 11:18:21 -04:00
mnowster 4b845746ef Merge pull request #2154 from dnephin/publish_master_builds 
Publish master builds to bintray
 2015-10-13 14:50:25 +01:00
Daniel Nephin 0e9ec8aa74 Add publish to bintray step to appveyor.yml 
Remove Set-PSDebug -trace to prevent the 9000+ lines of debug output
from spamming the logs on appveyor.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 10:02:59 -04:00
Daniel Nephin 9ce1884925 Add upload to bintray from travis. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 14:54:05 -04:00
Daniel Nephin ad96e10938 Add travis.yml for building binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 11:07:20 -04:00
Daniel Nephin 34f5912bbc Update release script and run.sh image name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 11:00:40 -04:00
Daniel Nephin 4ae2a0e610 Update release scripts for release image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 15:21:34 -04:00
Daniel Nephin 6edb6fa262 Test against a list of versions generated from docker/docker tags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:51:52 -04:00
Aanand Prasad 018b1b1c0f Add preparation instructions to Windows build script 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-06 12:57:01 +01:00
mnowster 19271898de Merge pull request #1806 from dnephin/run_script 
Docker image and bash script for running compose in a container
 2015-10-02 17:12:25 +01:00
Daniel Nephin 39cea970b8 alpine docker image for running compose and a script to pull and run it with the 
correct volumes.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-10-02 11:38:35 -04:00
Daniel Nephin 1a2a0dd53d Fix some bugs in the release scripts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 11:21:38 -04:00
Daniel Nephin da91b81bb8 Add scripts for automating parts of the release. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 11:21:38 -04:00
Daniel Nephin d5991761cd Fix building the binary on appveyor, and have it create an artifact. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:40:28 -04:00
mnowster aa70209ade Merge pull request #1957 from aanand/stub-run-on-windows 
WIP: Build Windows binary
 2015-09-21 16:21:12 +01:00
Aanand Prasad 4ae7f00412 Build Windows binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Daniel Nephin db433041b4 Restore the dist volume mount for building linux binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-18 12:08:09 -04:00
mnowster e2ab2eb9d0 Merge pull request #2065 from dnephin/use-dind-image 
Use dockerswarm/dind image for ci
 2015-09-18 16:10:41 +01:00
Daniel Nephin 8b29a50b52 Trim the dockerfile and re-use the virtualenv we already have. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 18:46:29 -04:00
Daniel Nephin 9978c3ea52 Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-17 17:35:49 -04:00
Aanand Prasad eb20590ca6 Use dockerswarm/dind image instead of doing docker-in-docker ourselves 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-17 16:53:20 -04:00
Daniel Nephin 9be748f85c Clean before doing a build so that we don't include stale build artifacts 
in the binaries.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 12:27:51 -04:00
Aanand Prasad b165ae07c9 Configure PyInstaller using docker-compose.spec 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-02 17:47:14 -07:00
Aanand Prasad 027414cfc0 Merge pull request #1918 from dnephin/fix_scripts_test 
Fix scripts/test and add to note about pre-commit hook to contributing
 2015-09-02 14:28:51 -07:00
Daniel Nephin 6ac617bae1 Split requirements-build.txt from requirements-dev.txt to support a leaner tox.ini 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-01 16:27:44 -04:00
Daniel Nephin 74782a56b5 Fix script/test by just calling script/test-versions directly instead of launching another container. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-31 17:08:47 -04:00
Daniel Nephin 2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:46:08 -04:00
funkyfuture 9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2 
In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-25 10:41:09 -04:00
Daniel Nephin fae6454661 Add pre-commit hooks 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:45 -04:00
Aanand Prasad bcb977425b Only use overlay driver in CI 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-12 15:36:10 +01:00
Aanand Prasad 7f90e9592a Use overlay driver in tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 18:05:09 +01:00
Aanand Prasad 4f14298694 Abort tests if daemon fails to start 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 14:45:35 +01:00
Mazz Mosley a248cfd65a Merge pull request #1692 from bfirsh/coverage 
Add test coverage support
 2015-08-05 11:32:33 +01:00
Aanand Prasad 430ba8cda3 Remove custom docs script 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-28 16:59:37 +01:00
Ben Firshman aab6df6ba4 Add test coverage support 
Prints out results on console and puts HTML report in `coverage-html`.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-07-15 10:09:37 +01:00
Aanand Prasad 4c2112dbfd Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
 2015-06-12 11:56:02 -04:00
Ben Firshman ac222140e7 Add image affinity to test script 
This will allow tests to be run on a Swarm. This is being fixed in
Swarm 0.4: https://github.com/docker/swarm/issues/743

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-06-11 15:58:07 -07:00
Aanand Prasad 8ad11c0bc8 Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:57 +01:00
Aanand Prasad c571bb485d Report Python and OpenSSL versions in --version output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:31 +01:00
Ben Firshman a6bd1d22a0 Don't mount code in a volume when running tests 
An image is built anyway, so this is unnecessary. This makes it
possible to run the tests on a remote Docker daemon.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-29 13:23:42 +01:00
Aanand Prasad 7d9aa8e0a9 Script to prepare OSX build environment 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-27 16:27:24 +01:00
Aanand Prasad 240495f07f Remove DCO validation from CI script 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-27 15:02:24 +01:00
Aanand Prasad 0650c4485a Test against Docker 1.6 RC2 only 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 16:04:22 -04:00
Aanand Prasad db852e14e4 Add script/ci 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-27 14:39:32 -07:00
akoskaaa 4e0f555c58 make flake8 a bit more specific 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-26 09:09:15 -07:00
akoskaaa 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