summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #5839 from docker/5744-build-isolationJoffrey F2018-03-30
|\ | | | | Add support for build isolation parameter
| * Fix unit testsJoffrey F2018-03-29
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add support for build isolation parameterJoffrey F2018-03-29
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #5843 from docker/bump_sdkJoffrey F2018-03-30
|\ \ | |/ |/| Bump SDK -> 3.2.1
| * Bump SDK -> 3.2.1Joffrey F2018-03-30
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #5838 from docker/bump_sdkJoffrey F2018-03-29
|\| | | | | Bump docker SDK -> 3.2.0
| * Bump docker SDK -> 3.2.0Joffrey F2018-03-29
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #5836 from docker/4399-overlay-ensureJoffrey F2018-03-29
|\ | | | | Ignore NotFound for external overlay networks
| * Ignore NotFound for external overlay networksJoffrey F2018-03-28
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #5833 from docker/5826-load_retry_utf8Joffrey F2018-03-28
|\ | | | | On load error, retry reading the file with UTF-8 encoding
| * On load error, retry reading the file with UTF-8 encodingJoffrey F2018-03-27
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #5831 from docker/5829-no-fallthroughJoffrey F2018-03-27
|\ \ | |/ |/| Avoid fallthrough with empty defaults
| * Avoid fallthrough with empty defaultsJoffrey F2018-03-27
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #5822 from brainlock/fix-gh-5179Joffrey F2018-03-27
|\ | | | | fix race condition in Service.create_container()
| * fix race condition in Service.create_container()Alberto Piai2018-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #5819 from docker/5433-build-zipJoffrey F2018-03-27
|\ \ | | | | | | Add --compress option to build command
| * | Add --compress option to build commandJoffrey F2018-03-23
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #5825 from docker/5824-shorthand-host-eqJoffrey F2018-03-27
|\ \ \ | |_|/ |/| | Support -H=host notation for interactive run/execs
| * | Support -H=host notation for interactive run/execsJoffrey F2018-03-26
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | missing "is"Joffrey F2018-03-23
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | pull_request_template.mdJoffrey F2018-03-23
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add issue / PR templates (fixes #5795)Joffrey F2018-03-23
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #5817 from docker/5815-libgcc-depJoffrey F2018-03-23
|\ | | | | Add libgcc dependency for Compose in a container
| * Add libgcc dependency for Compose in a containerJoffrey F2018-03-23
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #5811 from docker/bump_sdkJoffrey F2018-03-21
|\ \ | |/ |/| Bump Docker python SDK -> 3.1.4
| * Bump Docker python SDK -> 3.1.4Joffrey F2018-03-21
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* 1.21.0-devJoffrey F2018-03-20
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'release'Joffrey F2018-03-20
|\ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #5807 from docker/bump-1.20.0Joffrey F2018-03-20
| |\ | | | | | | Bump 1.20.0
| | * Bump 1.20.0Joffrey F2018-03-20
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * pip3?Joffrey F2018-03-20
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Bump Docker SDK -> 3.1.3Joffrey F2018-03-20
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Manage encoding errors in progress_streamJoffrey F2018-03-20
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Merge remote-tracking branch 'origin/release' into bump-1.20.0Joffrey F2018-03-20
| | |\ | | |/ | |/|
| * | Merge pull request #5770 from docker/bump-1.20.0-rc2Joffrey F2018-03-12
| |\| | | | | | | Bump 1.20.0 RC2
| | * Bump 1.20.0-rc2Joffrey F2018-03-08
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Update Dockerfile.run to produce smaller imageJoffrey F2018-03-08
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Install both versions of pythonJoffrey F2018-03-08
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Preserve security_opt values in extendsJoffrey F2018-03-08
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Revamp ParallelStreamWriter to fix display issues.Matthieu Nottale2018-03-08
| | | | | | | | | | | | Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
| | * SDK version 3.1.1Joffrey F2018-03-08
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Add support for options added in 1.20.0 to bash completionHarald Albers2018-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | New options: - `docker-compose --log-level` - `docker-compose pull --include-deps` - `docker-compose run --use-aliases` Signed-off-by: Harald Albers <github@albersweb.de>
| | * Fix a race condition in ParallelStreamWriter.Matthieu Nottale2018-03-08
| | | | | | | | | | | | Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
| | * Merge remote-tracking branch 'origin/release' into bump-1.20.0-rc2Joffrey F2018-03-08
| | |\ | | |/ | |/|
| * | Merge pull request #5726 from docker/bump-1.20.0-rc1Joffrey F2018-02-27
| |\| | | | | | | Bump 1.20.0 rc1
| | * Bump 1.20.0-rc1Joffrey F2018-02-27
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #5805 from docker/bump_sdkJoffrey F2018-03-20
|\ \ \ | | | | | | | | Bump Docker SDK -> 3.1.3
| * | | Bump Docker SDK -> 3.1.3Joffrey F2018-03-20
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #5798 from mnottale/cpu-rtJoffrey F2018-03-19
|\ \ \ | | | | | | | | Add support for cpu_rt_period and cpu_rt_runtime.
| * | | Add support for cpu_rt_period and cpu_rt_runtime.Matthieu Nottale2018-03-19
| | | | | | | | | | | | | | | | Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>