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

4853 Commits

Author SHA1 Message Date
Joffrey F 3f85c4291b
Merge pull request #5867 from albers/refactor-completion-services 
Refactor bash completion for services
 2018-04-12 11:46:21 -07:00
Joffrey F 7078c8740a Bump 1.22.0 dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-12 11:31:44 -07:00
Joffrey F d898b0cee4 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-12 11:31:30 -07:00
Joffrey F 27447d9144 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-12 11:30:26 -07:00
Harald Albers 20a9ae50b0 Refactor bash completion for services 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-04-11 12:47:10 +02:00
Joffrey F d787f2572b
Merge pull request #5863 from docker/bump-1.21.0 
Bump 1.21.0
 2018-04-10 13:34:44 -07:00
Joffrey F 5920eb082c Bump 1.21.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-09 13:54:39 -07:00
Joffrey F 614bfd6fb0 Make sure error messages are unicode strings before combining 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-09 13:54:38 -07:00
Joffrey F 0fe7bd753e Merge remote-tracking branch 'origin/release' into bump-1.21.0 2018-04-09 13:52:57 -07:00
Joffrey F 6234cc8343
Merge pull request #5858 from docker/5855-error-encoding 
Make sure error messages are unicode strings before combining
 2018-04-09 12:06:29 -07:00
Joffrey F 8356576a9a Make sure error messages are unicode strings before combining 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-09 11:46:33 -07:00
Joffrey F 9cc30ad0e9
Merge pull request #5844 from docker/bump-1.21.0-rc1 
Bump 1.21.0 RC1
 2018-04-02 14:57:03 -07:00
Joffrey F 1d329808cc Bump 1.21.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 18:35:35 -07:00
Joffrey F e69b9a21ca Fix port serialization with external IP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 18:35:35 -07:00
Joffrey F 2975f06ca2
Merge pull request #5845 from docker/5253-port-serialize 
Fix port serialization with external IP
 2018-03-30 18:34:18 -07:00
Joffrey F 7aa51a18ff Fix port serialization with external IP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 18:02:06 -07:00
Joffrey F 6f65908910 Merge remote-tracking branch 'origin/release' into bump-1.21.0-rc1 2018-03-30 15:32:01 -07:00
Joffrey F 4813494717
Merge pull request #5767 from docker/5402-lcow-support 
Add 2.4 file format with platform support (build/pull)
 2018-03-30 15:30:02 -07:00
Joffrey F e6420bd011 Update 2.4 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 12:41:19 -07:00
Joffrey F 520f5d0fde Add 2.4 file format with platform support. Also reads DOCKER_DEFAULT_PLATFORM env 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 12:39:10 -07:00
Joffrey F 54c535d2f1
Merge pull request #5839 from docker/5744-build-isolation 
Add support for build isolation parameter
 2018-03-30 12:35:18 -07:00
Joffrey F 9708b2570f
Merge pull request #5843 from docker/bump_sdk 
Bump SDK -> 3.2.1
 2018-03-30 11:48:03 -07:00
Joffrey F 24a4e312dc Bump SDK -> 3.2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 11:30:13 -07:00
Joffrey F 070474acae Fix unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 17:21:47 -07:00
Joffrey F 2e100353d3 Add support for build isolation parameter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 16:57:07 -07:00
Joffrey F bc6b091bff
Merge pull request #5838 from docker/bump_sdk 
Bump docker SDK -> 3.2.0
 2018-03-29 16:56:30 -07:00
Joffrey F e19fa1ad4d Bump docker SDK -> 3.2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 16:32:15 -07:00
Joffrey F 1e9a66c75b
Merge pull request #5836 from docker/4399-overlay-ensure 
Ignore NotFound for external overlay networks
 2018-03-29 11:08:02 -07:00
Joffrey F 344003a2f9 Ignore NotFound for external overlay networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-28 16:49:00 -07:00
Joffrey F 8d96980ba4
Merge pull request #5833 from docker/5826-load_retry_utf8 
On load error, retry reading the file with UTF-8 encoding
 2018-03-28 11:45:04 -07:00
Joffrey F 46191fe07b
Merge pull request #5831 from docker/5829-no-fallthrough 
Avoid fallthrough with empty defaults
 2018-03-27 12:41:07 -07:00
Joffrey F 90c57f99e8 On load error, retry reading the file with UTF-8 encoding 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-27 12:37:21 -07:00
Joffrey F 71d40c2a9b Avoid fallthrough with empty defaults 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-27 11:10:30 -07:00
Joffrey F 7e787a8c15
Merge pull request #5822 from brainlock/fix-gh-5179 
fix race condition in Service.create_container()
 2018-03-27 09:24:40 -07:00
Alberto Piai 394c8efe98 fix race condition in Service.create_container() 
The Service.create_container() method fetches a list of the current
containers in order to determine the next container number. In doing so,
it makes several API calls: one to fetch the list of containers, then
one per container in order to inspect it.

In some situations it can happen that a container is removed after
having been listed: in that case, the call to inspect will get a 404 and
raise a NotFound.

One situation in which this has been observed is when trying to
concurrently create multiple one-off containers for the same service
(using `docker-compose run` and a unique `--name`), as described in
more detail in gh-5179.

This patch adds a unit test that simulates the race between the
calls to list and to inspect, and changes Service._next_container_number
to skip removed containers instead of blowing up.

Fixes gh-5179

Signed-off-by: Alberto Piai <apiai@sensational.ch>
 2018-03-27 10:21:15 +02:00
Joffrey F 771a1382bd
Merge pull request #5819 from docker/5433-build-zip 
Add --compress option to build command
 2018-03-27 00:52:06 +02:00
Joffrey F 408781906c
Merge pull request #5825 from docker/5824-shorthand-host-eq 
Support -H=host notation for interactive run/execs
 2018-03-27 00:06:03 +02:00
Joffrey F cbb9bff924 Support -H=host notation for interactive run/execs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-26 14:25:31 -07:00
Joffrey F 7d68d4bb44 missing "is" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 18:03:08 +01:00
Joffrey F 36e6466855 pull_request_template.md 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 18:02:16 +01:00
Joffrey F 4e97e0fd41 Add issue / PR templates (fixes #5795) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 17:59:22 +01:00
Joffrey F 255d16d7fa Add --compress option to build command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 17:05:15 +01:00
Joffrey F d74154781a
Merge pull request #5817 from docker/5815-libgcc-dep 
Add libgcc dependency for Compose in a container
 2018-03-23 14:29:26 +01:00
Joffrey F 166f355efb Add libgcc dependency for Compose in a container 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 14:08:06 +01:00
Joffrey F a2f685927a
Merge pull request #5812 from docker/bump-1.20.1 
Bump 1.20.1
 2018-03-21 16:36:54 +01:00
Joffrey F 85b8df4112
Merge pull request #5811 from docker/bump_sdk 
Bump Docker python SDK -> 3.1.4
 2018-03-21 14:56:56 +01:00
Joffrey F 5d8c71b2c6 Bump 1.20.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-21 14:52:08 +01:00
Joffrey F e5ce2e6c07 Bump Docker python SDK -> 3.1.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-21 14:52:08 +01:00
Joffrey F b7ab358c54 Merge remote-tracking branch 'origin/release' into bump-1.20.1 2018-03-21 14:45:44 +01:00
Joffrey F db10ef2624 Bump Docker python SDK -> 3.1.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-21 14:40:21 +01:00