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

5050 Commits

Author SHA1 Message Date
Alexander 9d7202d122 Squashed commit of the following: 
commit d3fbd3d630099dc0d34cb1a93b0a664f633a1c25
Author: zasca <gorstav@gmail.com>
Date:   Wed Oct 3 11:27:43 2018 +0600

    Fix typo in function name, path separator updated

commit bc3f03cd9a7702b3f2d96b18380d75e10f18def0
Author: zasca <gorstav@gmail.com>
Date:   Tue Oct 2 11:12:28 2018 +0600

    Fix endswith arg in the test

commit 602d2977b4e881850c99c7555bc284690a802815
Author: zasca <gorstav@gmail.com>
Date:   Mon Oct 1 12:24:17 2018 +0600

    Update test

commit 6cd7a4a2c411ddf9b8e7d91194c60fb2238db8d7
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 11:13:36 2018 +0600

    Fix last test

commit 0d37343433caceec18ea15babf924b5975b83c80
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 10:58:57 2018 +0600

    Unit test added

commit fc086e544677dd33bad798c773cb92600aaefc51
Author: zasca <gorstav@gmail.com>
Date:   Thu Sep 27 20:28:03 2018 +0600

    Improved expanding source paths of volumes

    defined with long syntax when paths starts with '~'

    Signed-off-by: Alexander <a.gorst.vinia@gmail.com>
 2018-10-05 14:52:56 +06:00
Joffrey F c17274d014
Merge pull request #6227 from docker/release-credentials 
Avoid cred helpers errors in release script
 2018-09-26 15:09:06 -07:00
Joffrey F 772a307192 Avoid cred helpers errors in release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-26 13:58:13 -07:00
Joffrey F 54c3136e34
Merge pull request #6225 from docker/fix_recreate_tests 
Don't rely on container names containing the db string to identify them
 2018-09-25 10:49:03 -07:00
Joffrey F cc2462e6f4 Don't rely on container names containing the db string to identify them 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 09:13:12 -07:00
Joffrey F 6194d78813
Merge pull request #6223 from docker/release_script_upgrade 
Fix some release script issues
 2018-09-25 09:03:36 -07:00
Joffrey F 4b4c250638 Fix some release script issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-24 20:05:40 -07:00
Joffrey F de2be2bf37
Merge pull request #6168 from jrbenito/update_armhf 
[armhf] Make Dockerfile.armhf compatible with main
 2018-09-21 16:05:32 -07:00
Joffrey F 2a7beb6350
Merge pull request #6204 from docker/5716-unix-paths-from-winhost 
Don't convert slashes for UNIX paths on Windows hosts
 2018-09-21 10:47:22 -07:00
Joffrey F 30afcc4994
Merge pull request #6209 from docker/images-use-service-tag 
Images use service tag
 2018-09-20 16:51:26 -07:00
Joffrey F 834acca497 Update acceptance test for image matching 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-20 15:48:08 -07:00
Joffrey F 7d0fb7d3f3 Rewrite images command method to decrease complexity 
Also ensure we properly detect matching image names when tag is omitted

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-20 15:48:08 -07:00
Boris HUISGEN 1b668973a2 Add acceptance test 
Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
 2018-09-20 15:48:08 -07:00
Boris HUISGEN a2ec572fdf Use same tag as service definition 
Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
 2018-09-20 15:48:08 -07:00
Joffrey F 0fb6cd1139
Merge pull request #6205 from docker/2473-windows-long-paths 
Force consistent behavior around long paths on Windows builds
 2018-09-19 18:11:29 -07:00
Joffrey F 96a49a0253 Force consistent behavior around long paths on Windows builds 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-19 16:09:21 -07:00
Joffrey F f80630ffcf
Merge pull request #6140 from docker/4688_no_sequential_ids 
Add randomly generated slug to container names to prevent collisions
 2018-09-19 15:12:41 -07:00
Joffrey F 9f9122cd95 Don't convert slashes for UNIX paths on Windows hosts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-19 11:36:51 -07:00
Joffrey F a5f42ae9e4
Merge pull request #6184 from docker/fix-zsh-completion 
Update zsh completion with new options, and ensure service names are properly retrieved
 2018-09-13 17:01:03 -07:00
Joffrey F 17d4845dbb
Merge pull request #6186 from maxwellb/patch-1 
Handle userns security
 2018-09-12 17:04:37 -07:00
Maxwell Bloch a7c05f41f1 Handle userns security 
- Adds `--userns=host` when `userns-remap` is set

Signed-off-by: Maxwell Bloch <maxwellbloch@live.com>
 2018-09-12 19:29:03 -04:00
Joffrey F 265d9dae4b Update zsh completion with new options, and ensure service names are properly retrieved 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 16:17:30 -07:00
Joffrey F 5916639383 Preserve container numbers, add slug to prevent name collisions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 12:07:52 -07:00
Joffrey F 4e2de3c1ff Replace sequential container indexes with randomly generated IDs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-11 15:26:58 -07:00
Joffrey F bd8b2dfbbc
Merge pull request #6178 from docker/update-versions-script 
Skip testing TPs/betas for now
 2018-09-10 15:44:42 -07:00
Joffrey F d491a81cec Skip testing TPs/betas for now 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-10 15:08:10 -07:00
Joffrey F bdd2c80d98
Merge pull request #6172 from riverzhang/typo 
Fix some typos
 2018-09-07 11:41:52 -07:00
Joffrey F 58c5b92f09
Merge pull request #6173 from mirake/fix-typo 
Typo fix: overriden -> overridden
 2018-09-07 11:41:00 -07:00
Joffrey F 7e6275219b
Merge pull request #6171 from tossmilestone/fix-typos 
Fix typos in CHANGELOG
 2018-09-07 11:27:30 -07:00
rongzhang 373c83ccd7 Fix some typo 
Signed-off-by: rongzhang <rongzhang@alauda.io>
 2018-09-07 16:57:43 +08:00
Xiaoxi He b66782b412 Fix typos in CHANGELOG 
Signed-off-by: Xiaoxi He <xxhe@alauda.io>
 2018-09-07 16:42:38 +08:00
ruicao 5713215e84 Typo fix: overriden -> overridden 
Signed-off-by: ruicao <ruicao@alauda.io>
 2018-09-07 16:08:19 +08:00
Josenivaldo Benito Jr a541d88d57 [armhf] Make Dockerfile.armhf compatible with main 
Dockerfile now uses python:3.6 image while Dockerfile.armhf uses
debian. Python image is officially supported in ARM archtecture hence,
the now both dockerfiles differs only on dockerbins.tgz file version.

May we use environmental variables to select dockerbins.tgz?

Signed-off-by: Josenivaldo Benito Jr <jrbenito@benito.qsl.br>
 2018-09-05 11:52:50 -03:00
Joffrey F db391c03ad
Merge pull request #6100 from docker/5960-parallel-pull-progress 
Add progress messages to parallel pull
 2018-08-24 11:02:24 -07:00
Joffrey F 2038bb5cf7
Merge pull request #6145 from deivid-rodriguez/bug/broken_url 
Fix broken url
 2018-08-20 14:34:00 -07:00
David Rodríguez 3a93e85762
Fix broken url 
As per https://github.com/sgerrand/alpine-pkg-glibc#please-note.

Signed-off-by: David Rodríguez <deivid.rodriguez@riseup.net>
 2018-08-17 14:08:41 -03:00
Joffrey F 901ee4e77b
Merge pull request #6134 from docker/4841-fix-project-dir 
Fix --project-directory handling to apply to .env files as well
 2018-08-13 16:03:47 -07:00
Joffrey F eb63e9f3c7 Fix --project-directory handling to apply to .env files as well 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-10 17:02:56 -07:00
Joffrey F ed245474c2
Merge pull request #6130 from docker/bump_sdk 
Bump Python SDK -> 3.5.0
 2018-08-10 14:08:36 -07:00
Joffrey F 5ad50dc0b3 Bump Python SDK -> 3.5.0 
Add support for Python 3.7

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-09 18:31:08 -07:00
Joffrey F f207d94b3c
Merge pull request #6126 from docker/wfender-2013-expose-config-hash 
Add --hash opt for config command
 2018-08-07 21:12:48 -07:00
Joffrey F ee878aee4c Handle missing (not built) service image in config --hash 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 20:23:21 -07:00
Joffrey F 861031b9b7 Reduce config --hash code complexity and add test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 17:25:35 -07:00
Joffrey F 707e21183f Fix config hash consistency with unprioritized networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 16:51:01 -07:00
Fender William 541fb65259 Add --hash opt for config command 
Signed-off-by: Fender William <fender.william@gmail.com>
 2018-08-07 16:51:01 -07:00
Joffrey F 473703d0d9
Merge pull request #6115 from graphaelli/parallel-build 
add --parallel option to build
 2018-08-02 15:23:06 -07:00
Joffrey F 6e95eb7437
Merge pull request #6104 from glorpen/fix-pipes 
Fixes pipe handling in container mode.
 2018-07-31 15:39:07 -07:00
Gil Raphaelli 89f2bfe4f3 add --parallel option to build 
Signed-off-by: Gil Raphaelli <g@raphaelli.com>
 2018-07-31 12:06:59 -04:00
Joffrey F 635c77db6c
Merge pull request #6071 from nickhiggs/6060-reattach-logger-on-restart 
Attach logger to containers after crashing.
 2018-07-25 15:20:43 -07:00
Joffrey F c956785cdc Add progress messages to parallel pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-25 14:39:18 -07:00