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

4820 Commits

Author SHA1 Message Date
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 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 db10ef2624 Bump Docker python SDK -> 3.1.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-21 14:40:21 +01:00
Joffrey F 679d3555a2 1.21.0-dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 16:10:08 +01:00
Joffrey F f7aa4a619f Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 16:08:34 +01:00
Joffrey F de00770d60
Merge pull request #5807 from docker/bump-1.20.0 
Bump 1.20.0
 2018-03-20 15:23:21 +01:00
Joffrey F ca8d3c6c18 Bump 1.20.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 15:10:49 +01:00
Joffrey F 80ce4eafa7 pip3? 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 15:10:49 +01:00
Joffrey F 538e982c93 Bump Docker SDK -> 3.1.3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 14:55:41 +01:00
Joffrey F fd94fab264 Manage encoding errors in progress_stream 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 14:55:23 +01:00
Joffrey F fd43dfba25 Merge remote-tracking branch 'origin/release' into bump-1.20.0 2018-03-20 14:51:57 +01:00
Joffrey F 80106e1711
Merge pull request #5805 from docker/bump_sdk 
Bump Docker SDK -> 3.1.3
 2018-03-20 12:58:25 +01:00
Joffrey F 25c048fd0a Bump Docker SDK -> 3.1.3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 12:15:51 +01:00
Joffrey F 876e1ba8d5
Merge pull request #5798 from mnottale/cpu-rt 
Add support for cpu_rt_period and cpu_rt_runtime.
 2018-03-19 06:51:25 -07:00
Joffrey F 6c7c7902f1
Merge pull request #5788 from mnottale/dash-underscore-in-project-name 
Allow dash and underscore in project name.
 2018-03-19 05:33:21 -07:00
Joffrey F 1c314a8757
Merge pull request #5792 from dakotahawkins/dakotahawkins-5790_update-docker-compose.ps1 
Add update-docker-compose.ps1 to contrib/update/
 2018-03-19 05:25:11 -07:00
Joffrey F 4a75fc7bbc
Merge pull request #5787 from mnottale/pull-parallel-by-default 
Pull parallel by default
 2018-03-19 05:19:32 -07:00
Matthieu Nottale 16ea49ac8c Add support for cpu_rt_period and cpu_rt_runtime. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-19 13:18:35 +01:00
Joffrey F 060d193168
Merge pull request #5785 from g0t4/master 
Fix docker-compose zsh running service name completion when using custom psFormat
 2018-03-19 05:15:41 -07:00
Joffrey F ac56e68241
Merge pull request #5793 from docker/5784-encoding-progress-stream 
Manage encoding errors in progress_stream
 2018-03-16 11:26:14 -07:00
Joffrey F b1ade31c67 Manage encoding errors in progress_stream 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-15 17:10:36 -07:00
Dakota Hawkins 5184f4f78d
Add update-docker-compose.ps1 to contrib/update/ 
Updates Windows' installed version of docker-compose to the latest
release.

Fixes #5790

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
 2018-03-15 19:21:34 -04:00
Joffrey F 273985aee7 Merge branch 'dnephin-remove-myself-as-maintainer' 2018-03-15 12:20:25 -07:00
Joffrey F 06593110dc Fix indentation + HOF comment 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-15 12:20:00 -07:00
Joffrey F af8ac1a67f Merge branch 'remove-myself-as-maintainer' of https://github.com/dnephin/compose into dnephin-remove-myself-as-maintainer 2018-03-15 12:13:14 -07:00
Matthieu Nottale 8336407830 pull: Deprecate '--parallel' and enable it by default. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:47:29 +01:00
Matthieu Nottale c7b76b1d12 pull: Honor --quiet in parallel mode. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:47:20 +01:00
Matthieu Nottale 5fe3aff1c3 Allow dash and underscore in project name. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:44:43 +01:00
Wes Higbee e7f0ab04a1 Fix docker-compose zsh running service name completion 
This applies to commands that operate on running services. For example: top, stop, restart, etc.

Configuring a custom psFormat in ~/.docker/config.json can break zsh
running service name completion that depends upon default `docker ps`
output. This breaks when you don't include the output needed by
completion.

The fix specifies the explicit format needed for completion and is based
on a previous fix in the docker CLI completion: 8b38343e46

Signed-off-by: Wes Higbee <wes.mcclure@gmail.com>
 2018-03-14 22:34:11 -04:00
Joffrey F 4e0fdd70bd
Merge pull request #5776 from docker/5772-catch-volume-divergence 
Check volume config against remote and error out if diverged
 2018-03-14 12:00:14 -07:00
Daniel Nephin a43ec0aa2e Remove myself as maintainer 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-13 14:41:20 -04:00
Joffrey F 0112c740ad Check volume config against remote and error out if diverged 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-12 17:19:03 -07:00
Joffrey F e35be8b0d4
Merge pull request #5770 from docker/bump-1.20.0-rc2 
Bump 1.20.0 RC2
 2018-03-12 11:31:24 -07:00
Joffrey F 8c4af54257 Bump 1.20.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:34:23 -08:00
Joffrey F 768e28ee30 Update Dockerfile.run to produce smaller image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:34:23 -08:00
Joffrey F 742979371d Install both versions of python 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:34:23 -08:00