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

198 Commits

Author SHA1 Message Date
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