tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,540 Commits 25 Branches 262 Tags 66 MiB
Commit Graph

5540 Commits

Author SHA1 Message Date
Kei Matsumoto 75d41edb94
fix: Add test 
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
 2019-07-14 03:38:29 +09:00
Goryudyuma f9099c91ae
fix: The correct number is displayed 
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
 2019-07-14 03:38:12 +09:00
Ulysses Souza 1b326fce57
Merge pull request #6720 from ijc/pass-env-to-docker-cli 
Pass environment when calling through to docker cli.
 2019-07-12 10:11:47 +02:00
Ulysses Souza ca721728f6
Merge pull request #6588 from javabrett/6587-default-mand-interp-err 
Default ?err to (missing) required VAR name. Fixed #6587.
 2019-07-11 17:17:46 +02:00
Ulysses Souza 2e31ebba6a
Merge pull request #6798 from chris-crone/linux-bump-deps 
Bump Linux build dependencies
 2019-07-11 16:09:58 +02:00
Christopher Crone 993bada521 Bump Linux build dependencies 
* Python 3.7.2 to 3.7.4
* Docker 18.09.5 to 18.09.7
* Alpine 3.9.3 to 3.10.0
* Debian stretch-20190326 to stretch-20190708

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-07-10 17:32:13 +02:00
Christopher Crone b0e7d801a3 Bump macOS build dependency 
* Python 3.7.3 to 3.7.4

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-07-10 17:03:45 +02:00
Chris Crone 7258edb75d
Merge pull request #6793 from chris-crone/bump-openssl-1.1.1c-python-3.7.3 
Bump macOS build dependencies
 2019-07-08 18:42:35 +02:00
Ulysses Souza f9d1075a5d
Merge pull request #6792 from ulyssessouza/bump-texttable 
Bump texttable from 0.9.1 to 1.6.2
 2019-07-08 15:23:31 +02:00
Ulysses Souza a1c9d4925a
Merge pull request #6791 from ulyssessouza/bump-mock 
Bump mock from 2.0.0 to 3.0.5
 2019-07-08 15:23:22 +02:00
Christopher Crone 3d80c8e86d Bump macOS build dependencies 
* OpenSSL 1.1.1a to 1.1.1c
* Python 3.7.2 to 3.7.3

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-07-08 15:05:10 +02:00
Ulysses Souza 0bfa1c34f0 Bump texttable from 0.9.1 to 1.6.2 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-08 14:52:30 +02:00
Ulysses Souza 57a2bb0c50 Bump mock from 2.0.0 to 3.0.5 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-08 13:47:19 +02:00
Ulysses Souza 3d693f3733
Merge pull request #6778 from ulyssessouza/cleanup-setup_py-versioning 
Strip up generic versions and bump requests
 2019-07-03 17:31:15 +02:00
Ulysses Souza ce5451c5b4 Strip up generic versions and bump requests 
Replaces generic limitations with a next major value
Bump the minimal `requests` to 2.20.0

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-02 15:49:07 +02:00
Ulysses Souza df2e833cf0
Merge pull request #6777 from ulyssessouza/pin-busybox-image-version 
Pin busybox image version in tests
 2019-07-02 14:33:56 +02:00
Ulysses Souza cacc9752a3 Pin busybox image version in tests 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-02 13:42:41 +02:00
Djordje Lukic 85d940909e
Merge pull request #6766 from docker/bump-1.24.1 
Bump 1.24.1
 2019-06-24 12:15:25 +02:00
Djordje Lukic 4667896b69 "Bump 1.24.1" 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-06-24 11:20:44 +02:00
Djordje Lukic a78e3b0c7c Bump docker-py 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-06-24 10:38:39 +02:00
Dave Tucker 5e7521909d Add .fossa.yml file 
This commit adds a .fossa.yml file used by fossa.io
It allows for fossa to scan the dependencies and figure out which oss
licenses are in use. This can be added to CI at some point in the near
future.

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
 2019-06-24 10:38:38 +02:00
Djordje Lukic 272e85dce3 Merge remote-tracking branch 'origin/release' into bump-1.24.1 2019-06-24 10:38:25 +02:00
Eli Uriegas cf419dce4c
Add .fossa.yml file (#6750) 
Add .fossa.yml file
 2019-06-17 10:23:44 -07:00
Dave Tucker 8c387c6013 Add .fossa.yml file 
This commit adds a .fossa.yml file used by fossa.io
It allows for fossa to scan the dependencies and figure out which oss
licenses are in use. This can be added to CI at some point in the near
future.

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
 2019-06-14 14:58:17 +01:00
Inconnu08 57055e0e66 Replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-06-02 20:21:21 +06:00
Inconnu08 c37fb783fe replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-06-01 01:31:35 +06:00
Inconnu08 b29b6a1538 replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-05-31 20:29:09 +06:00
Harald Albers d68113f5c0 Add bash completion for `config --no-interpolate` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2019-05-24 21:59:14 +02:00
Ulysses Souza 2bc4161526
Merge pull request #6726 from docker/bump-1.25.0-rc1 
Bump 1.25.0-rc1
 2019-05-24 00:33:04 +02:00
Ulysses Souza 8552e8e283 "Bump 1.25.0-rc1" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-23 23:39:09 +02:00
Ulysses Souza 3803d35c03 Merge remote-tracking branch 'upstream/release' into bump-1.25.0-rc1 2019-05-23 23:38:30 +02:00
Ulysses Souza 26e1a2dd31
Merge pull request #6725 from ulyssessouza/fix-release-script 
Fix release script get_full_version()
 2019-05-23 23:37:06 +02:00
Ulysses Souza 1f55b533c4 Fix release script get_full_version() 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-23 23:35:57 +02:00
Brett Randall fb4d5aa7e6
Include required but missing VAR name and assignment in interpolation error message. 
Error message format is now e.g.:

ERROR: Missing mandatory value for "environment" option interpolating ['MYENV=${MYVAR:?}'] in service "myservice":

Fixed #6587.

Signed-off-by: Brett Randall <javabrett@gmail.com>
 2019-05-24 07:01:39 +10:00
Ulysses Souza e806520dc3
Merge pull request #6723 from ulyssessouza/fix-reorder-imports 
Fix imports ordering
 2019-05-23 22:04:50 +02:00
Ulysses Souza a2516c48d9 Fix imports ordering 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-23 22:04:02 +02:00
Ulysses Souza 79639af394
Merge pull request #6721 from ulyssessouza/fix-release-finalize 
Fix 'finalize' command on release script
 2019-05-23 21:39:40 +02:00
Ulysses Souza 2d2b0bd9a8 Fix 'finalize' command on release script 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-23 21:38:20 +02:00
Ian Campbell 9d2508cf58 Pass environment when calling through to docker cli. 
This ensures that settings from any `.env` file (such as `DOCKER_HOST`) are
passed on to the cli.

Unit tests are adjusted for the new parameter and a new case is added to ensure
it is propagated as expected.

Fixes: 6661

Signed-off-by: Ian Campbell <ijc@docker.com>
 2019-05-23 16:29:46 +01:00
Ulysses Souza e1baa90f6b
Merge pull request #6719 from ulyssessouza/fix-release-script 
Fix release script for null user
 2019-05-22 19:01:01 +02:00
Ulysses Souza c15e8af7f8 Fix release script for null user 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-22 19:00:16 +02:00
Ulysses Souza 4218b46c78
Merge pull request #6666 from joakimr-axis/armpurge 
Purge Dockerfile.armhf which is no longer needed
 2019-05-22 16:27:09 +02:00
Ulysses Souza 81258f59db
Merge pull request #6715 from ulyssessouza/bump-dockerpy-401 
Bump docker-py 4.0.1
 2019-05-22 14:11:07 +02:00
Ulysses Souza e4b4babc24 Bump docker-py 4.0.1 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-22 11:55:37 +02:00
Ian Campbell f764faa841
Merge pull request #6649 from GeyseR/requests_upgrade 
support requests up to 2.22.0 version
 2019-05-21 13:36:31 +01:00
Sergey Fursov a857be3f7e
support requests up to 2.22.x version 
Signed-off-by: Sergey Fursov <geyser85@gmail.com>
 2019-05-21 14:50:17 +03:00
Ian Campbell a89128118b
Merge pull request #6342 from collin5/b5547 
--remove-orphans is ignored when using up --no-start
 2019-05-20 15:45:24 +01:00
Ian Campbell 263d18ce93
Merge pull request #6624 from orisano/feat-empty-cache-from 
feat: drop empty tag on cache_from
 2019-05-20 15:35:48 +01:00
Nao YONASHIRO 51ee6093df feat: drop empty tag on cache_from 
Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
 2019-05-20 23:32:15 +09:00
Ulysses Souza 9de6ec3700
Merge pull request #6695 from Inconnu08/fix_depreciation 
fixes warn method is deprecated
 2019-05-20 12:34:51 +02:00