tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,514 Commits 22 Branches 267 Tags 56 MiB
Commit Graph

5514 Commits

Author SHA1 Message Date
Christopher Crone 8820343882 Stash all macOS build artifacts 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-11-29 18:28:17 +01:00
Christopher Crone fedc8f71ad Build single binary and folder format for macOS 
Previously we were overwriting the single binary with the folder
format.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-11-29 18:27:39 +01:00
Ulysses Souza e82d38f333
Merge pull request #7052 from ndeloof/pull_can_build 
Report image we can't pull and must be built
 2019-11-29 15:48:38 +01:00
Christopher Crone d6b5d324e2 Use Python3 for macOS build environment 
With the deprecation of Python 2 coming soon, explicitly use
Python 3.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-11-28 20:26:58 +01:00
Ulysses Souza 44edd65065
Merge pull request #7009 from glance-/shellcheck 
Resolve shellcheck warnings in container-script
 2019-11-28 13:37:50 +01:00
Nicolas De Loof 55c5c8e8ac
Report image we can't pull and must be built 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-25 15:18:27 +01:00
Ulysses Souza 517efbf386
Merge pull request #7005 from glance-/HOME-in-container 
Pass in HOME env-var in container mode.
 2019-11-22 17:02:07 +01:00
Anton Lundin c8cfc590cc
Better userns detection in container-script 
This uses formatting to have docker info just emit the information we're interested in.

Based-on-code-by: Sebastiaan van Stijn <github@gone.​nl>
Signed-off-by: Anton Lundin <anton.lundin@umu.se>

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
 2019-11-22 16:24:09 +01:00
Ulysses Souza a7e8356651 Update maintainers and add CODEOWNERS for github 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-11-22 16:00:07 +01:00
Ulysses Souza 332fa8bf62
Merge pull request #7010 from ndeloof/catalina 
Build OSX binary as a directory
 2019-11-22 15:26:09 +01:00
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 e13a7213f1
Build OSX binary as a directory 
OSX Catalina otherwise do scan the temporary executable files created by the single-file packaging.

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2019-11-21 09:01:41 +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
Anton Lundin aeddfd41d6
Resolve shellcheck warnings in container-script 
This fixes a couple of small potential issues pointed out by shellcheck.

Signed-off-by: Anton Lundin <anton.lundin@umu.se>
 2019-11-07 21:55:03 +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
Anton Lundin b9a4581d60
Pass in HOME env-var in container mode. 
To get ~/-paths to work as expected in contaier mode, env-var HOME must
be the same outside the container as inside the docker-compose
container, otherwise HOME inside the container points to /root which
might not be what the user expects.

Signed-off-by: Anton Lundin <anton.lundin@umu.se>
 2019-11-06 13:05:58 +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