ab927b986f
Test against 1.10rc1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-15 19:04:01 -05:00
82b288b25b
Fix linux master build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-15 15:02:19 -05:00
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
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
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
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
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
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
661519ac1c
Only test latest version in CI script
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:21:53 -08:00
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
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
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
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
3f39ffe72e
FAQ document for Compose
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 10:47:32 -08:00
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
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
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
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
d4b9845201
Add the git sha to version output
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-18 13:21:14 -05:00
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
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
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
8306405340
On error print daemon logs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 12:40:59 -04:00
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
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
f3d49e38c0
Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3
...
Upgrade to pyinstaller 3
2015-10-26 11:54:02 +00:00
0340361f56
Upgrade pyinstaller to 3.0
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-23 13:34:49 -04:00
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
1bc3c97f2a
Make storage driver configurable in CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 15:26:44 -04:00
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
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
fbe8e76902
Add missing merge for release branch.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:24:05 -04:00
338f2f4507
Add a script to generate contributor list.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:14:04 -04:00
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
f228173660
Print docker version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
4b845746ef
Merge pull request #2154 from dnephin/publish_master_builds
...
Publish master builds to bintray
2015-10-13 14:50:25 +01:00
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
9ce1884925
Add upload to bintray from travis.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-07 14:54:05 -04:00
ad96e10938
Add travis.yml for building binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-07 11:07:20 -04:00
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
4ae2a0e610
Update release scripts for release image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 15:21:34 -04:00
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
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
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
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
1a2a0dd53d
Fix some bugs in the release scripts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
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
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
aa70209ade
Merge pull request #1957 from aanand/stub-run-on-windows
...
WIP: Build Windows binary
2015-09-21 16:21:12 +01:00
4ae7f00412
Build Windows binary
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-18 18:10:29 +01:00
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
e2ab2eb9d0
Merge pull request #2065 from dnephin/use-dind-image
...
Use dockerswarm/dind image for ci
2015-09-18 16:10:41 +01:00
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
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
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
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
b165ae07c9
Configure PyInstaller using docker-compose.spec
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-02 17:47:14 -07:00
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
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
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
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
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
fae6454661
Add pre-commit hooks
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:45 -04:00
bcb977425b
Only use overlay driver in CI
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-12 15:36:10 +01:00
7f90e9592a
Use overlay driver in tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 18:05:09 +01:00
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
a248cfd65a
Merge pull request #1692 from bfirsh/coverage
...
Add test coverage support
2015-08-05 11:32:33 +01:00
430ba8cda3
Remove custom docs script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-28 16:59:37 +01:00
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
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
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
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
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
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
7d9aa8e0a9
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 16:27:24 +01:00
240495f07f
Remove DCO validation from CI script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-27 15:02:24 +01:00
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
db852e14e4
Add script/ci
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-27 14:39:32 -07:00
4e0f555c58
make flake8 a bit more specific
...
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
2015-03-26 09:09:15 -07:00
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
16495c577b
Revert "Use dev version of Docker"
...
This reverts commit d209ded13c
2015-03-23 15:04:10 -07:00
d209ded13c
Use dev version of Docker
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
85fb8956f3
Validate DCO in script/test-versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-17 18:02:22 -07:00
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
7b1f01bb52
Add script/shell
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-12 14:02:14 +00:00
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
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
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
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
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
16d6018419
Fix typos
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:28:49 +00:00
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
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
2af7693e64
WIP: rename Fig to Compose
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
c12d1d73f0
Remove containers in scripts
...
So we don't clutter up Docker with loads of stopped containers.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-09 10:49:37 -08:00
bb85e238e0
Add fig as entrypoint to Dockerfile
...
A step towards "docker run fig".
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-11-20 17:23:43 +00:00
38a3ee8d63
Use upstream dockerpty 0.3.2
...
This reverts commit 60411e9f05Closes #556
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Conflicts:
requirements.txt
setup.py
2014-11-04 10:23:42 +00:00
60411e9f05
Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7
...
Include TLS fixes and relative imports:
c8b4935534
2014-10-16 16:24:39 +01:00
f4b599551a
Use uname to generate binary download URL
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-30 18:59:18 -07:00
b4fbab4b56
Run pyinstaller build as normal user
...
... and test build on CI so we don't break it again!
Fixes #503
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-30 16:25:40 -07:00
Daniel Nephin
Aanand Prasad
Thomas Hourlier
Joffrey F
Nick Jones
Daniel Nephin
Joffrey F
Simon van der Veldt
Stefan Scherer
mnowster
Corin Lawson
funkyfuture
Ben Firshman
akoskaaa
Sven Dowideit