95005e6c03
Improve spelling in the README.md
...
Improve spelling of the brand names:
- GitHub instead of Github
Signed-off-by: Daniel Schildt <daniel.schildt@gmail.com>
2018-02-03 17:31:22 +02:00
632abe94c0
Parallelize Docker versions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-02 17:38:33 -08:00
a3e1d54bf7
Merge pull request #5639 from docker/faster_jenkins_tests
...
Remove obsolete code that slows down test execution
2018-02-02 15:50:55 -08:00
dce62c81d5
Remove obsolete code that slows down test execution
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-02 15:18:55 -08:00
ee7422af0e
Merge pull request #5637 from docker/v3.6_schema_support
...
Add support for 3.6 schema and tmpfs mount size
2018-02-02 13:24:30 -08:00
9dde4fff0e
Add support for 3.6 schema and tmpfs mount size
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-02 12:01:41 -08:00
4b6bfa47fc
Merge pull request #5588 from docker/python3-binaries
...
Compile binaries on Python 3.6
2018-02-01 16:59:09 -08:00
a0f78539b6
Test and build on 3.6 (replaces 3.4) ; dist 3.6-compiled binaries
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 16:05:32 -08:00
7fad02e350
Merge pull request #5635 from docker/bump-1.19.0-rc3
...
Bump 1.19.0 rc3
2018-02-01 15:02:54 -08:00
8725385813
Merge pull request #5631 from docker/bump_sdk
...
Bump python SDK to 3.0.0
2018-02-01 14:51:05 -08:00
cdd02822f5
Bump 1.19.0-rc3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 14:23:22 -08:00
ea0dc8a408
Fix DOCKER_TLS_VERIFY bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 14:23:22 -08:00
e0e0b22f07
Merge remote-tracking branch 'origin/release' into bump-1.19.0-rc3
2018-02-01 14:20:42 -08:00
4ffe036f65
Merge pull request #5634 from docker/5632-tls-verify
...
Fix DOCKER_TLS_VERIFY bug
2018-02-01 13:44:17 -08:00
4d4e066fbc
Fix DOCKER_TLS_VERIFY bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 12:16:32 -08:00
d8d484e0e1
Bump python SDK to 3.0.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-31 18:54:58 -08:00
6cfbb7ed8a
Add missing `-q|--quiet` options to increase consistency
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-01-30 01:28:15 +01:00
dfcb02c60d
Merge pull request #5610 from docker/bump-1.19.0-rc2
...
Bump 1.19.0 rc2
2018-01-26 11:34:04 -08:00
a186c3142b
Bump 1.19.0-rc2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:25:51 -08:00
cc2f023747
Circle token
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:25:51 -08:00
14485b306c
Don't leak circle API auth info
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:25:51 -08:00
70ad55cd88
Trigger remote build for OSX 10.11
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:25:51 -08:00
0f41e07a5c
Add bash completion for `up {--always-recreate-deps,--renew-anon-volumes}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-01-25 18:25:51 -08:00
be2fb53934
Merge remote-tracking branch 'origin/release' into bump-1.19.0-rc2
2018-01-25 18:22:55 -08:00
520fad331f
Circle token
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:13:49 -08:00
b9939c97e5
Don't leak circle API auth info
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 18:10:56 -08:00
234e8d5d05
Merge pull request #5609 from docker/xcode_7
...
Trigger remote build for OSX 10.11
2018-01-25 18:06:14 -08:00
5d1554c9df
Trigger remote build for OSX 10.11
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-25 17:56:21 -08:00
ab2301dd21
Merge pull request #5604 from albers/completion-up
...
Add bash completion for `up {--always-recreate-deps,--renew-anon-volumes}`
2018-01-24 16:43:31 -08:00
a9ac6778df
Merge pull request #5602 from docker/bump-1.19.0-rc1
...
Bump 1.19.0-rc1
2018-01-24 16:14:52 -08:00
d149ccd312
Bump 1.19.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-24 15:36:08 -08:00
707f9db18a
Merge pull request #5605 from docker/circleci-osx-build
...
Move Linux/OSX builds from Travis to CircleCI
2018-01-24 15:30:56 -08:00
e09ea2f0f0
Add circleCI build/test config for Mac OSX
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-24 15:15:07 -08:00
456906d7ad
Merge pull request #5603 from docker/5591-mount-rename-recreate
...
Don't break during recreate when a mount target is updated
2018-01-24 14:15:32 -08:00
b27c245395
Add bash completion for `up {--always-recreate-deps,--renew-anon-volumes}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-01-24 23:08:25 +01:00
c5154d6b2b
Don't break during recreate when a mount target is updated
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-23 15:25:25 -08:00
b64cfd1982
Merge pull request #5596 from docker/4337-recreate-anon-volumes
...
Add up flag `--renew-anon-volumes` (shorthand -V)
2018-01-23 10:07:33 -08:00
f679f77555
Merge pull request #5598 from carlwgeorge/mock-import-fix
...
Use mock compatibility import
2018-01-23 09:55:13 -08:00
d8083b61c4
Merge pull request #5595 from docker/5594-merge-deploy
...
Advanced merge for deploy dict in v3 files
2018-01-23 09:54:29 -08:00
8b5d32373e
Use mock compatibility import
...
`tests/__init__.py` already has a try/except statement to use mock from
the standard library when possible. Take advantage of it like other
tests already do.
Signed-off-by: Carl George <carl@george.computer>
2018-01-22 23:10:50 -06:00
b07091ac5f
Add up flag `--renew-anon-volumes` (shorthand -V)
...
to avoid reusing the previous container's data
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-22 16:08:33 -08:00
b968d34227
Advanced merge for deploy dict in v3 files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-22 15:05:53 -08:00
fd1e8024f7
Merge pull request #5593 from docker/4651-tls-env-and-flags
...
Support mixed use of TLS flags and TLS environment variables
2018-01-22 11:01:44 -08:00
593a675d2b
Support mixed use of TLS flags and TLS environment variables
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 15:48:30 -08:00
c97dbf260b
Merge pull request #5583 from docker/Rozelette-5465-no-image-error
...
Recover from ImageNotFound when recreating service
2018-01-19 15:37:08 -08:00
9ba9016cbc
Improve ImageNotFound handling in convergence
...
- Improved CLI prompt
- Attempt volume preservation with new image config
- Fix container.rename_to_tmp_name()
- Integration test replicates behavior ; remove obsolete unit test
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 14:16:57 -08:00
4042121f6e
The updated unit test simulates the error in the bug. What's happening
...
is that the container has an image sha (represented by
'shaDOES_NOT_EXIST') which causes an error when client.inspect_image
is called on it, because the image has actually been removed.
Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
2018-01-19 14:16:56 -08:00
2d986dff79
Remove rebuild parameter ; set do_build instead
...
Reduce repetition in main.py
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 14:16:56 -08:00
7591639c72
Fix #5465 by catching a no-image exception in
...
get_container_data_volumes. The ImageNotFound exception is now bubbled
up to the client, which prompts the user on the desired course of action
(rebuild or abort). Added a case to the unit test to check that
an empty existing image doesn't result in an exception.
Closed old pull request #5466 because I did a rebase and it showed over
300 commits to merge, which I thought was messy.
Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
2018-01-19 14:16:56 -08:00
5d4ccafd35
Merge pull request #5580 from docker/5578-use_cli_exec
...
Use CLI for interactive exec on all platforms by default
2018-01-19 14:15:07 -08:00
Daniel Schildt
Joffrey F
Joffrey F
Harald Albers
Carl George
Ian Glen Neal