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

42 Commits

Author SHA1 Message Date
Chris Crone
a3e6e28eeb deps: Bump Python, Docker, base images 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-26 15:25:09 +01:00
Bastian Venthur
e8424d5ae0 Removed Python2 support 
Closes: #6890

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>
 2020-06-03 17:37:47 +02:00
Ulysses Souza
0ace76114b Add conformity tests hack 
- That can be used with:
./script/test/acceptance

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-03-10 15:41:28 +01:00
Joakim Roubert
482bca9519 Purge Dockerfile.armhf which is no longer needed 
Current Dockerfile builds fine for armhf and thus the outdated
Dockerfile.armhf is unnecessary.

Change-Id: Idafdb9fbddedd622c2c0aaddb1d5331d81cfe57d
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-04-23 09:53:42 +02:00
Ulysses Souza
2b24eb693c Refactor release and build scripts 
- Make use of the same Dockerfile when producing
an image for testing and for deploying to
DockerHub

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-17 16:08:33 +02:00
Ulysses Souza
c217bab7f6 Refactor Dockerfiles for generating musl binaries 
- Refactor Dockerfile to be used for tests and distribution on docker hub on debian and alpine
to use for final usage and also tests
- Adapt test scripts to the new Dockerfiles' structure
- Adapt Jenkinsfile to add alpine to the test matrix

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-17 16:08:33 +02:00
Ulysses Souza
a734371e7f Bump python version from 3.6.8 to 3.7.2 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-02-21 13:56:45 +01:00
Joffrey F
b21a06cd6f Re-enable testing of TP and beta releases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-04 01:40:39 -07:00
Joffrey F
5916639383 Preserve container numbers, add slug to prevent name collisions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 12:07:52 -07:00
Joffrey F
d491a81cec Skip testing TPs/betas for now 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-10 15:08:10 -07:00
ruicao
5713215e84 Typo fix: overriden -> overridden 
Signed-off-by: ruicao <ruicao@alauda.io>
 2018-09-07 16:08:19 +08:00
Joffrey F
c2052d0370 Add blacklist to versions.py CI script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-07 11:39:24 -08:00
Joffrey F
632abe94c0 Parallelize Docker versions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-02 17:38:33 -08:00
Joffrey F
a0f78539b6 Test and build on 3.6 (replaces 3.4) ; dist 3.6-compiled binaries 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 16:05:32 -08:00
Joffrey F
0bcfc721f8 s/docker daemon/dockerd/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-09 12:06:55 -07:00
Joffrey F
821bd54663 Take editions into account when selecting test engine versions 
Get candidates from moby/moby and docker/docker-ce repos

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-09 12:06:55 -07:00
Joffrey F
ac99bc5bbf Merge pull request #4444 from jcberthon/compose-master-armv7 
Provide support for ARM 32bit
 2017-03-01 14:31:05 -08:00
Joffrey F
c2553ac777 Update versions.py script to support new engine versioning schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-21 14:05:47 -08:00
Jean-Christophe Berthon
5193e56a65 Add first attempt at supporting test suite on ARM 
Modify `script/test/default` so it supports a first attempt at testing on ARM.
Call the script with: `$ DOCKERFILE=Dockerfile.armhf script/test/default` to
use the Dockerfile.armhf instead of the default Dockerfile for building the image.

However, running the script is not working fully. The problem is that
`dockerswarm/dind` does not provide an ARM image and therefore cannot be executed.
If that is fixed then we should be able to change the script in order to use the ARM
image instead of the default x86_64 image for running further tests.

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
 2017-02-08 12:52:48 +00:00
Aaron.L.Xu
169289c8b6 find a fishbone 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-01-20 00:52:19 +08:00
Mike Dougherty
4871523d5e Update Jenkinsfile to perform existing jenkins tasks 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-10-25 11:51:02 -07:00
Daniel Nephin
4bf5271ae2 Skip invalid git tags in versions.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-12 14:41:40 -04: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
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
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
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
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
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
85fb8956f3 Validate DCO in script/test-versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-17 18:02:22 -07: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
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
Aanand Prasad
2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Ben Firshman
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
Ben Firshman
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
Ben Firshman
38a3ee8d63 Use upstream dockerpty 0.3.2 
This reverts commit 60411e9f05ac2b9245053491cef7c3cda9e923f1.

Closes #556

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
 2014-11-04 10:23:42 +00:00
Aanand Prasad
60411e9f05 Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7 
Include TLS fixes and relative imports:

c8b4935534

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 16:24:39 +01:00
Ben Firshman
a3f70a9f64 Make script/test use Docker 
Really easy to run entire test suite with Docker now. Also switch
Wercker to use the same script.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-30 13:51:42 -07:00
Ben Firshman
01e2b56405 Add flake8 to test script 
For those who don't use tox.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-28 16:27:57 -07:00
Aanand Prasad
d0b5bcf26a Pass byte strings straight through LogPrinter 2014-06-18 14:51:13 +01:00
Aanand Prasad
c246897af1 Pass script/test arguments through to nosetests 2014-06-18 14:51:13 +01:00
Ben Firshman
7b925b8eac Add some helpful scripts 2013-12-20 21:32:41 +00:00