tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 19:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,167 Commits 22 Branches 289 Tags
Commit Graph

198 Commits

Author SHA1 Message Date
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
Aanand Prasad
16495c577b Revert "Use dev version of Docker" 
This reverts commit d209ded13c9a7478fc47c41b2319fcf3c1935131.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:10 -07:00
Aanand Prasad
d209ded13c Use dev version of Docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad
85fb8956f3 Validate DCO in script/test-versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-17 18:02:22 -07:00
Ben Firshman
1e5b9dc2eb Merge pull request #1005 from aanand/docker-in-docker 
Run tests using Docker-in-Docker so we can test multiple versions
 2015-03-17 15:13:59 +00:00
Aanand Prasad
7b1f01bb52 Add script/shell 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-12 14:02:14 +00:00
Aanand Prasad
42e6296b0e Kick everything off from a single container 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00:00
Aanand Prasad
74440b2f92 Run tests using Docker-in-Docker so we can test multiple versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00:00
Ben Firshman
a42f2007ea Merge pull request #1001 from SvenDowideit/build-docs-in-local-fig-repo 
add ./script/doc to build fig documentation using the docs.docker.com to...
 2015-02-23 22:45:59 +00:00
Sven Dowideit
bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10:00
Ben Firshman
0fa0131372 Add script which runs Fig inside Docker 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-20 14:33:15 +00:00
Aanand Prasad
16d6018419 Fix typos 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:28:49 +00:00
Aanand Prasad
8297f55f2c Remove all website-related stuff from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad
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