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

5501 Commits

Author SHA1 Message Date
Ulysses Souza a83d86e7ce
Merge pull request #7037 from ndeloof/stdin 
config_detail.filename is None when passed by stdin
 2019-11-22 15:24:43 +01:00
Ulysses Souza 1de8205996
Merge pull request #7048 from ulyssessouza/update-dev-version 
Update dev version to 1.26.0dev
 2019-11-22 14:15:09 +01:00
Ulysses Souza d837d27ad7 Update dev version 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-22 14:13:50 +01:00
Ulysses Souza cfc131b502
Merge pull request #7042 from ulyssessouza/release 
Sync backport changes in release 1.25.0
 2019-11-22 14:10:42 +01:00
Nicolas De Loof e6ec77047b Revert "only pull images that can't build" 
This reverts commit c6dd7da15e.

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-21 14:37:41 +01:00
Ulysses Souza f4cf7a939e Announce drop py2 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-21 13:23:56 +01:00
Nicolas De Loof fa9e8bd641
Skip label if some config file was passed by stdin 
com.docker.compose.project.config_files must contain valid file paths

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-21 09:59:22 +01:00
Nicolas De Loof fe2b692547
testcase for compose file read from stdin 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-20 15:38:15 +01:00
Nicolas De Loof 962421d019
config_detail.filename is None when passed by stdin 
Fix #7032

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-20 09:00:47 +01:00
Ulysses Souza 4038169d96
Merge pull request #7028 from docker/bump-1.25.0 
Bump 1.25.0
 2019-11-18 22:56:24 +01:00
Ulysses Souza b42d4197ce Add latest tag question on resume and start to tag on build 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-18 22:46:12 +01:00
Ulysses Souza 0a186604be "Bump 1.25.0" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-18 19:35:34 +01:00
Ulysses Souza d072601197 "Bump 1.25.0" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-18 19:29:40 +01:00
Ulysses Souza a0592ce585 "Bump 1.25.0" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-18 19:14:13 +01:00
Ulysses Souza c49678a11f Merge remote-tracking branch 'upstream/release' into bump-1.25.0 2019-11-18 18:28:25 +01:00
Ulysses Souza 2887d82d16
Merge pull request #6982 from smamessier/fix_non_ascii_error 
Fixed non-ascii error when using COMPOSE_DOCKER_CLI_BUILD=1 for Buildkit
 2019-11-18 16:45:04 +01:00
Ulysses Souza 2919bebea4 Fix non ascii chars error. Python2 only 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-18 15:43:50 +01:00
Djordje Lukic 5478c966f1
Merge pull request #7008 from zelahi/fix-readme-link 
Fixed broken README link for common use cases
 2019-11-07 09:59:49 +01:00
Zuhayr Elahi e546533cfe
Fixed broken README link for common use cases 
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
 2019-11-06 17:10:48 -08:00
Jean-Christophe Sirot abef11b2a6
Merge pull request #6996 from ajlai/fix-color-order-and-remove-red 
Make container service color deterministic, remove red from chosen colors
 2019-11-06 16:11:57 +01:00
Anthony Lai 802fa20228 Make container service color deterministic, remove red from chosen colors 
Signed-off-by: Anthony Lai <anthonyjlai@gmail.com>
 2019-11-03 23:44:31 +00:00
Djordje Lukic fa34ee7362
Merge pull request #6973 from glours/set_no_color_if_clicolor_defined_to_0 
Set no-colors to true if CLICOLOR env variable is set to 0
 2019-10-31 16:45:10 +01:00
Sebastien Mamessier a3a23bf949 Fixed error when using startswith on non-ascii string 
Signed-off-by: Sebastien Mamessier <smamessier@uber.com>
 2019-10-30 13:57:08 +01:00
Djordje Lukic f6b6cd22df
Merge pull request #6987 from docker/bump-1.25.0-rc4 
Bump 1.25.0-rc4
 2019-10-28 16:54:32 +01:00
Djordje Lukic 8f3c9c58c5 "Bump 1.25.0-rc4" 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-10-28 16:18:12 +01:00
Djordje Lukic 52c3e94be0 Merge remote-tracking branch 'origin/release' into bump-1.25.0-rc4 2019-10-28 16:16:58 +01:00
Jean-Christophe Sirot cfc48f2c13
Merge pull request #6986 from rumpl/fix-unit-test-close-fd 
Cleanup all open files
 2019-10-28 16:07:18 +01:00
Djordje Lukic f8142a899c Cleanup all open files 
If the fd is not closed the cleanup will fail on windows.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-10-28 15:36:05 +01:00
Djordje Lukic ea22d5821c
Merge pull request #6984 from docker/bump-1.25.0-rc3 
Bump 1.25.0-rc3
 2019-10-28 12:13:11 +01:00
Djordje Lukic c7e82489f4 "Bump 1.25.0-rc3" 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-10-28 11:33:59 +01:00
Djordje Lukic 952340043a Merge remote-tracking branch 'origin/release' into bump-1.25.0-rc3 2019-10-28 11:24:06 +01:00
Guillaume Lours 2e7493a889 Set no-colors to true if CLICOLOR env variable is set to 0 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2019-10-21 11:37:46 +02:00
Jean-Christophe Sirot 4be2fa010a
Merge pull request #6972 from glours/align_image_size_display_to_docker_cli 
Format image size as decimal to be align with Docker CLI
 2019-10-18 15:26:15 +02:00
Guillaume Lours 386bdda246 Format image size as decimal to be align with Docker CLI 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2019-10-18 12:50:38 +02:00
okor 17bbbba7d6 update docker-py 
Signed-off-by: Jason Ormand <jason.ormand1@gmail.com>
 2019-10-18 09:37:24 +02:00
Nicolas De Loof 1ca10f90fb Fix acceptance tests 
tty is now (correclty) reported to have 80 columns, which split service
ID in two lines

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-10-16 14:31:27 +02:00
Nicolas De Loof 452880af7c Use python Posix support to get tty size 
stty is not portable outside *nix
Note: shutil.get_terminal_size require python 3.3

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-10-16 14:31:27 +02:00
Guillaume LOURS 944660048d
Merge pull request #6964 from guillaumerose/addmorelabels 
Add working dir, config files and env file in service labels
 2019-10-15 10:06:42 +02:00
Guillaume Rose dbe4d7323e Add working dir, config files and env file in service labels 
Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
 2019-10-15 09:18:09 +02:00
Guillaume Rose 1678a4fbe4 Run CI on amd64 
Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
 2019-10-14 22:01:04 +02:00
Guillaume LOURS 4e83bafec6
Merge pull request #6955 from ndeloof/paramiko 
Bump paramiko to 2.6.0
 2019-10-10 10:59:44 +02:00
Nicolas De Loof 8973a940e6
Bump paramiko to 2.6.0 
close #6953

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-10-10 08:55:15 +02:00
Zuhayr Elahi 8835056ce4 UPDATED log message 
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
 2019-10-10 07:08:42 +02:00
Zuhayr Elahi 3135a0a839 Added log message to check compose file 
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
 2019-10-10 07:08:42 +02:00
Guillaume Lours cdae06a89c exclude issue flagged with kind/feature from stale process 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2019-10-09 21:51:34 +02:00
Guillaume Lours 79bf9ed652 correct invalid yaml indentation 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2019-10-09 21:10:18 +02:00
Nicolas De loof 29af1a84ca
Merge pull request #6952 from glours/stale_configuration 
Add config file for @probot/stale
 2019-10-09 16:41:58 +02:00
Guillaume Lours 9375c15bad Add config file for @probot/stale 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2019-10-09 16:16:57 +02:00
Chris Crone 8ebb1a6f19
Merge pull request #6949 from jcsirot/fix-pushbin-script-verbosity 
Remove set -x to make this script less verbose
 2019-10-09 12:04:24 +02:00
Jean-Christophe Sirot 37be2ad9cd Remove set -x to make this script less verbose 
Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>
 2019-10-09 10:51:17 +02:00