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

206 Commits

Author SHA1 Message Date
Daniel Nephin 04877d47aa Build osx binary on travis and upload to bintray. 
This requires a change to the make-branch script, to have it push the bump branch
to the docker remote instead of the user remote. Pushing to the docker remote
triggers the travis build, which builds the binary.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-01 11:34:54 -05:00
Aanand Prasad c72e9b3843 Add release notes for 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:55:04 -08:00
Daniel Nephin 11dc720752 Move test scripts to script/test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
Daniel Nephin ec6bb1660d Move run scripts to script/run 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
Daniel Nephin a87d482a3b Move all build scripts to script/build 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
Daniel Nephin 49ef8a271d Add release notes for 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 15:13:01 -08:00
Chia-liang Kao 2204b642ef Quote argv as they are 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:57:04 +08:00
Chia-liang Kao e6a675f338 Detect -t and -i separately 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:56:26 +08:00
Chia-liang Kao dd55415d4f Don't mount pwd if it is / 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:56:17 +08:00
Aanand Prasad e8756905ba Run test containers in TTY mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:31:28 +00:00
Aanand Prasad 634ae7daa5 Let the user specify any repo as their fork 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 15:40:28 +00:00
Aanand Prasad 3547c55523 Default to vim if EDITOR is not set 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 15:40:28 +00:00
Aanand Prasad e40a46349f Fix rebase-bump-commit script 
Trim whitespace from wc's output before constructing arguments to `git rebase`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 17:42:44 +00:00
Aanand Prasad 5a249bd9f5 Fix Windows build failures when installing dependencies from git 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 11:39:08 +00:00
Daniel Nephin 66dd9ae9a4 Fix some bugs in release scripts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-18 15:59:40 -05:00
Daniel Nephin ab927b986f Test against 1.10rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 19:04:01 -05:00
Daniel Nephin 82b288b25b Fix linux master build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 15:02:19 -05:00
Aanand Prasad ab2d18851f Test against a dev build of Engine 1.10 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:20 +00:00
Thomas Hourlier f7a7e68df6 Mount $HOME in /root to share docker config. 
Fixes #2630

Signed-off-by: Thomas Hourlier <thomas.hourlier@cnode.fr>
 2016-01-11 09:52:51 -08:00
Aanand Prasad 978e9cf38f Fix script/clean on systems where `find` requires a path argument 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-08 13:10:05 +00:00
Daniel Nephin bf1552da79 Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:24 -05:00
Daniel Nephin 475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Joffrey F 1dcdd98da4 Add TODO note to restore n-1 version testing after 1.10 release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:24:58 -08:00
Joffrey F 661519ac1c Only test latest version in CI script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Daniel Nephin 1d3aeaaae7 Ignore extra coverge files 
These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-10 15:29:36 -08:00
Aanand Prasad 53cc99a822 Merge pull request #2513 from punkstar/detect-tty 
Only allocate a tty if we detect one
 2015-12-08 15:26:46 +00:00
Nick Jones f2c232bb10 Only allocate a tty if we detect one 
Signed-off-by: Nick Jones <nick@nicksays.co.uk>
 2015-12-07 09:56:28 +00:00
Daniel Nephin de4a18ea6c Cherry-pick release notes for 1.5.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-04 10:26:20 -08:00
Daniel Nephin 3f39ffe72e FAQ document for Compose 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 10:47:32 -08:00
Daniel Nephin 6e89a5708f cherry-pick release notes from 1.5.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-24 13:24:46 -05:00
Daniel Nephin 8bc84c74e7 Merge pull request #2417 from dnephin/inlude_git_sha_in_version 
Add the git sha to version output
 2015-11-20 11:39:38 -05:00
Joffrey F dd1a2b36fa Merge pull request #2389 from hypriot/use-uname-for-target 
Use uname to build target name for different platforms
 2015-11-19 10:36:33 -08:00
Simon van der Veldt efbfa9e38f run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH 
env vars to compose container

Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2015-11-18 21:40:16 +01:00
Daniel Nephin d4b9845201 Add the git sha to version output 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 13:21:14 -05:00
Stefan Scherer c99f2f8efd Use uname to build target name for different platforms 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-11-13 08:33:51 +01:00
Daniel Nephin d18ad4c812 Fix rebase-bump-commit script when used with a final release. 
Previously it would find commits for RC releases, which broke the rebase.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -05:00
Daniel Nephin abde64d610 On a test failure only show the last 100 lines of daemon output. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 14:16:52 -05:00
Daniel Nephin 8306405340 On error print daemon logs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 12:40:59 -04:00
Daniel Nephin bbc76e6034 Convert the README to rst and fix the logo url before packaging it up for pypi. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 12:11:29 -04:00
Daniel Nephin c4f0f24c57 Fix release script notes about software and typos. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 12:10:30 -04:00
mnowster f3d49e38c0 Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3 
Upgrade to pyinstaller 3
 2015-10-26 11:54:02 +00:00
Daniel Nephin 0340361f56 Upgrade pyinstaller to 3.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-23 13:34:49 -04:00
mnowster 986036b6f9 Merge pull request #2223 from au-phiware/master 
Powershell script to run compose in a container.
 2015-10-23 18:10:18 +01:00
Daniel Nephin 1bc3c97f2a Make storage driver configurable in CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 15:26:44 -04:00
Daniel Nephin 129e2f9482 Fix check for tags. 
If there is a branch with the same name as a tag it fails without the
--tags. This was only a problem when we're branching from a git tag.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 12:33:25 -04:00
Corin Lawson 4d8e667c3e Powershell script to run compose in a container. 
This script assumes the typical environment that Windows users operate,
namely, VirtualBox running the boot2docker ISO, managed by
docker-machine. I wrote this script for my Windows using colleagues and
first placed it in the public domain as a gist:
https://gist.github.com/au-phiware/25213e72c80040f398ba
In short, that script works for me.

I have adapted that script to use the (yet to be) official image
(docker/compose:latest) and also added an extra environment variable to
provide additional options to docker run.

Signed-off-by: Corin Lawson <corin@phiware.com.au>
 2015-10-19 22:32:35 +11:00
Daniel Nephin fbe8e76902 Add missing merge for release branch. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 15:24:05 -04:00
Daniel Nephin 338f2f4507 Add a script to generate contributor list. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 15:14:04 -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
Aanand Prasad 16495c577b Revert "Use dev version of Docker" 
This reverts commit d209ded13c.

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