Commit Graph

137 Commits

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