tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,935 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

293 Commits

Author SHA1 Message Date
Joffrey F 86428af5bc Bump 1.20.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 14:44:21 -08:00
Joffrey F c3a5488d11 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-08 13:56:22 -08:00
Joffrey F 522825e411 Merge branch 'release' 2018-02-07 12:18:28 -08:00
Joffrey F 9e633ef35a Bump 1.19.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 10:59:31 -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 cdd02822f5 Bump 1.19.0-rc3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 14:23:22 -08:00
Joffrey F a186c3142b Bump 1.19.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-25 18:25:51 -08:00
Joffrey F d149ccd312 Bump 1.19.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-24 15:36:08 -08:00
Joffrey F e09ea2f0f0 Add circleCI build/test config for Mac OSX 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-24 15:15:07 -08:00
Joffrey F 095292bf83 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 15:58:40 -08:00
Joffrey F 8dd22a962a Bump 1.18.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 13:20:55 -08:00
Joffrey F 189468b07f Bump 1.18.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:30:44 -08:00
Joffrey F 38ae7ae037 Update script to generate sha256 files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-07 12:04:26 -08:00
Joffrey F e96dfbac2a Bump 1.18.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:40:53 -08:00
Joffrey F 0f97864238 Add shasum computation to download-binaries script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Joffrey F 6d101fb068 Bump 1.17.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F d94cfff78d Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:47 -07:00
Joffrey F 5e032b7e8f Bump 1.17.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:17 -07:00
Joffrey F 2482d57e9a Add shasum computation to download-binaries script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:26:31 -07:00
Joffrey F ac53b73e79 Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07:00
Joffrey F a0f95afcd1 Bump 1.17.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-17 14:59:13 -07:00
Joffrey F eab333adb1 Update release process with most recent changes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Andrew Hsu 4900f09991 Bump 1.16.1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-01 15:43:44 -07:00
Joffrey F 36e5985b01 Update release process with most recent changes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-01 12:16:39 -07:00
Joffrey F cb82e3d192 Bump 1.16.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:49:43 -07:00
Joffrey F cfb0fda1b1 Bump 1.16.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:49:43 -07:00
Joffrey F dc4b77deb0 Bump 1.16.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:49:43 -07:00
Joffrey F 07d5042859 Bump 1.16.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:36:32 -07:00
Joffrey F 5cc23c540c Bump 1.16.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Joffrey F 7805960a73 Bump 1.16.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 4652d3c38a Use newer versions of pre-commit hooks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 0c4fc93895 Use newer versions of pre-commit hooks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-02 20:02:26 -07:00
Joffrey F f71293bb76 Bump 1.15.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 18:20:24 -07:00
Joffrey F d668fd1c67 Bump 1.15.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 18:20:09 -07:00
Joffrey F ade23b585e Bump 1.15.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 16:50:14 -07:00
Joffrey F 686a533c9f Scripts build and push compose-tests image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 16:50:14 -07:00
Joffrey F 6ed507d865 Scripts build and push compose-tests image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-20 16:39:03 -07:00
Joffrey F 344a69331c Bump 1.15.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 86a0e36348 s/docker daemon/dockerd/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 85d2c0a314 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-07-13 17:37:26 -07:00
Joffrey F f9bd31adad Bump 1.14.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F d81a27be02 Bump 1.14.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F 73dfdfffb0 Bump 1.14.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F cffce0880b Bump 1.14.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 13:28:04 -07: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 cfe152f907 Bump 1.14.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F e6000051f7 Bump 1.14.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Pascal Vibet c9ff9023b2 If COMPOSE_FILE is define then set this variable to the container 
Signed-off-by: Pascal Vibet <pvibet@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F e27dfe8ccd Script downloading release binaries from bintray and appveyor 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Pascal Vibet 7dafbd1e9c If COMPOSE_FILE is define then set this variable to the container 
Signed-off-by: Pascal Vibet <pvibet@gmail.com>
 2017-05-23 12:19:22 -07:00
Joffrey F 301b06ca92 Merge pull request #4793 from shin-/sync-release_master 
Resync release and master branches
 2017-05-04 14:41:06 -07:00
Joffrey F 353c3a7b7a Script downloading release binaries from bintray and appveyor 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 16:48:16 -07:00
Joffrey F 1719ceb881 Bump 1.13.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 15:25:43 -07:00
Joffrey F 38af51314e Bump 1.13.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
fate-grand-order 8471276e73 fix misspell "compatibility" in script/ci 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-03-17 11:35:10 +08:00
Marcos Lilljedahl 44653f2812 Improve Dockerfile.run 
This dockerfile generates a more lightweight image that works with the
current official dynamically generated binaries

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Change image script to use new Dockerfile.run image without building
compose

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Apply suggested fixes

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
 2017-03-03 15:17:10 -08:00
Joffrey F b4dfa9c155 Merge pull request #3867 from ncopa/use-posix-shell-for-run 
Use posix shell instead of bash for run.sh
 2017-03-01 17:19:28 -08: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
Aaron.L.Xu 27297fd1af fix a typo in script/release/utils.sh 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 11:14:49 +08:00
Joffrey F fc7b74d7f9 Bump to next dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:47:08 -08:00
Joffrey F 01d1895a35 Bump 1.11.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:44:40 -08:00
Joffrey F 979a0d53f7 Bump 1.11.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:44:31 -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
Joffrey F 62cdd25b7d Merge pull request #4323 from shin-/fix-push-release-script 
Use correct wheel file name in twine upload command
 2017-01-12 11:52:05 -08:00
Joffrey F 29b46d5b26 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 15:39:48 -08:00
Joffrey F 19190ea0df Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:43:26 -08:00
Thomas Grainger 2648af6807
enable universal wheels 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2017-01-04 18:33:58 +00:00
Thomas Grainger 024b5dd6da
case PyPI correctly 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2016-11-22 11:15:21 +00:00
Joffrey F 3b46a62f36 Merge pull request #4073 from mikedougherty/jenkinsfile 
Update Jenkinsfile to run "janky" tasks
 2016-11-02 14:55:11 -07: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
Albin Kerouanton 99343fd76c Fix path of the parent dir of COMPOSE_FILE 
Signed-off-by: Albin Kerouanton <albin.kerouanton@knplabs.com>
 2016-10-25 11:09:45 +02:00
Joffrey F 2d3c76950f Merge pull request #3972 from shin-/fix-contributors-script 
Fix the contributors script
 2016-10-18 15:25:55 -07:00
Joffrey F b50b14f937 Fix openssl dependency in OSX binary build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 17:08:14 -07:00
Joffrey F 5667de87e8 Fix the contributors script to show only contributors on the current branch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-22 12:34:59 -07:00
Natanael Copa 0839fb93c1 Use posix shell instead of bash for run.sh 
There are no bash specific uses in the script so we can use posix shell.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-08-22 14:41:38 -07:00
Joffrey F 1110af1bae Bump 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 13:30:06 -07:00
Aanand Prasad 7fafd72c1e Bump 1.8.0-rc3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 13:22:20 -07:00
Aanand Prasad 60622026fa Bump 1.8.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 13:22:07 -07:00
Joffrey F 22c0779a49 Bump 1.8.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 13:21:47 -07:00
Daniel Nephin 3d0a1de023 Upgrade pip on osx 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-30 20:52:15 -04:00
Aanand Prasad 33bed5c706 Use latest OpenSSL version (1.0.2h) when building Mac binary on Travis 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-20 12:04:37 +01: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 50287722f2 Update release notes and set version to 1.8.0dev 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-13 13:27:18 -04:00
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