tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-14 09:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,517 Commits 20 Branches 280 Tags
Commit Graph

5517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nao YONASHIRO
862a13b8f3 fix: add build flags 
Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
 2019-08-28 17:24:14 +02:00
Nao YONASHIRO
cacbcccc0c Add support to CLI build 
This includes can be enabled by setting the env var
`COMPOSE_NATIVE_BUILDER=1`.

Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-08-28 17:24:14 +02:00
Samuel Searles-Bryant
672ced8742 Change Formatter.table method to staticmethod 
Make this a staticmethod so it's easier to use without needing to init a
Formatter object first.

Signed-off-by: Samuel Searles-Bryant <samuel.searles-bryant@unipart.io>
 2019-08-22 14:25:15 +01:00
Djordje Lukic
4cfa622de8
Merge pull request #6631 from chibby0ne/update_jsonschema_dependency 
requirements: update jsonschema dependency
 2019-08-22 12:54:48 +02:00
Ulysses Souza
525bc9ef7a
Merge pull request #6856 from aiordache/bump-alpine 
update alpine version to 3.10.1
 2019-08-21 15:49:14 +02:00
aiordache
60dcf87cc0 update alpine version to 3.10.1 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2019-08-20 12:10:26 +02:00
Ulysses Souza
2c668e237d
Merge pull request #6835 from docker/bump-1.25.0-rc2 
Bump 1.25.0-rc2
1.25.0-rc2 		2019-08-07 15:03:32 +02:00
Ulysses Souza
661ac20e5d "Bump 1.25.0-rc2" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-08-06 15:28:46 +02:00
Ulysses Souza
ab93b87f04 Merge remote-tracking branch 'upstream/release' into bump-1.25.0-rc2 2019-08-06 15:05:08 +02:00
Jean-Christophe Sirot
cf3c07d6ee
Merge pull request #6826 from ulyssessouza/env_override_integration_test 
Add integration tests regarding environment
 2019-07-31 14:15:53 +02:00
Ulysses Souza
b03889ac2a Add integration tests regarding environment 
This covers what was included in #6800

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-31 02:09:41 +02:00
Antonio Gutierrez
66856e884c
requirements: update jsonschema dependency 
Fixes: https://github.com/docker/compose/issues/6347

Signed-off-by: Antonio Gutierrez <chibby0ne@gmail.com>
 2019-07-27 21:43:40 +02:00
Djordje Lukic
7a7c9ff67a
Merge pull request #6800 from KlaasH/revise-env-file-option 
Make '--env-file' option top-level only and fix failure with subcommands
 2019-07-25 12:15:11 +02:00
Klaas Hoekema
413e5db7b3 Add shell completions for --env-file option 
Adds completions for the --env-file toplevel option to the bash, fish,
and zsh completions files.

Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
 2019-07-24 09:25:10 -04:00
Klaas Hoekema
69c0683bfe Pass toplevel_environment to run_one_off_container 
Instead of passing `project_dir` from `TopLevelCommand.run` to
`run_one_off_container` then using it there to load the toplevel
environment (duplicating the logic that `TopLevelCommand.toplevel_environment`
encapsulates), pass the Environment object.

Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
 2019-07-24 09:25:10 -04:00
Klaas Hoekema
088a798e7a Fix typo in 'split_env' error message 
Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
 2019-07-24 09:25:10 -04:00
Klaas Hoekema
35eb40424c Call TopLevelCommand's environment 'toplevel_environment' 
To help prevent confusion between the different meanings and sources
of "environment", rename the method that loads the environment from
the .env or --env-file (i.e. the one that applies at a project level)
to 'toplevel_environment'.

Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
 2019-07-24 09:25:05 -04:00
Klaas Hoekema
99464d9c2b Handle environment file override within TopLevelCommand 
Several (but not all) of the subcommands are accepting and processing the
`--env-file` option, but only because they need to look for a specific
value in the environment. The work of applying the override makes more
sense as the domain of TopLevelCommand, and moving it there and removing
the option from the subcommands makes things simpler.

Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
 2019-07-24 09:24:06 -04:00
Silvin Lubecki
cd8e2f870f
Merge pull request #6813 from ulyssessouza/fix_stdin_open 
Fix stdin_open when running docker-compose run
 2019-07-24 11:20:20 +02:00
Ulysses Souza
c641ea08ae Fix stdin_open when running docker-compose run 
This fix makes sure that stdin_open specified in the service
is considering when shelling out to the CLI

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-22 17:27:10 +02:00
Jean-Christophe Sirot
d285ba6aee
Merge pull request #6803 from ulyssessouza/pin-image-tags 
Pin test images on a non rolling tag
 2019-07-19 16:35:22 +02:00
Ulysses Souza
cd098e0cad Pin test images on a non rolling tag 
Mainly busybox:latest to the current latest which is 1.31.0-uclibc

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-18 11:10:37 +02:00
Djordje Lukic
d212fe68a6
Merge pull request #6728 from albers/completion-config--no-interpolate 
Add bash completion for `config --no-interpolate`
 2019-07-16 11:59:18 +02:00
Djordje Lukic
c8279bc4db
Merge pull request #6738 from Inconnu08/set-optimization 
Replace sets with set literal syntax for efficiency
 2019-07-15 15:23:24 +02:00
Djordje Lukic
61aa2e346e
Merge pull request #6797 from chris-crone/macos-bump-python-3.7.4 
Bump macOS build dependency
 2019-07-15 10:33:45 +02:00
Djordje Lukic
98932e9cb4
Merge pull request #6754 from Goryudyuma/6740-fix-display 
fix: The correct number is displayed
 2019-07-15 10:30:59 +02:00
Goryudyuma
59491c7d77
add: test for units 
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
 2019-07-14 04:31:16 +09:00
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
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