Commit Graph

2486 Commits

Author SHA1 Message Date
Wanzhi Du 7a28ff3510 Ignore comment line from the .dockerignore file
This fixed the bug that test comment line in .dockerignore file as ignore rule
bug.

Add test for "# comment" patterns in .dockerignore.

Signed-off-by: Wanzhi Du <wanzhi09@gmail.com>
2018-03-05 18:10:09 +08:00
Joffrey F 9b8e022fa1
Merge pull request #1928 from mnottale/fix-spurious-resolution-macos-slowdown
Workaround requests resolving our unix socket URL on macosx.
2018-02-27 08:58:59 -08:00
Joffrey F fe966764ef
Merge pull request #1927 from mefyl/master
Add test for "/.." patterns in .dockerignore.
2018-02-26 10:53:41 -08:00
Matthieu Nottale 15c26e7057 Workaround requests resolving our unix socket URL on macosx.
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-02-26 14:47:26 +01:00
mefyl 4295919103
Add test for "/.." patterns in .dockerignore.
Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-26 12:59:46 +01:00
Joffrey F 8b246db271
Merge pull request #1922 from yongtang/02232018-cleanup
Cleanup containers during the tests
2018-02-23 13:34:55 -08:00
Yong Tang ab1f90a379 Cleanup containers during the tests
This fix tries to clean up the containers during the tests
so that no pre-existing volumes left in docker integration tests.

This fix adds `-v` when removing containers, and makes sure
containers launched in non-daemon mode are removed.

This fix is realted to moby PR 36292

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-23 15:22:42 +00:00
Joffrey F d41e06092d 3.2.0-dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-22 14:59:19 -08:00
Joffrey F 79f27c68ab
Merge pull request #1921 from docker/3.1.0-release
3.1.0 release
2018-02-22 14:43:15 -08:00
Joffrey F 1d85818f4c Bump 3.1.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-22 13:52:44 -08:00
Joffrey F 9a4cc53c52 Merge branch 'release' into 3.1.0-release
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docker/version.py
	tests/unit/api_test.py
	tests/unit/utils_test.py
2018-02-22 13:36:15 -08:00
Joffrey F cc6e1b1249
Merge pull request #1914 from mefyl/master
Improve .dockerignore compliance
2018-02-22 13:35:41 -08:00
Joffrey F ad5f49b690
Merge pull request #1918 from rycus86/service-restart-method
Shorthand method for service.restart()
2018-02-21 12:05:10 -08:00
Viktor Adam e54e8f4199 Shorthand method for service.force_update()
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2018-02-21 19:55:17 +00:00
mefyl 0c948c7df6
Add note about potential dockerignore optimization.
Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-21 17:05:27 +01:00
mefyl 3b464f983e
Skip entirely excluded directories when handling dockerignore.
This is pure optimization to not recurse into directories when
	there are no chances any file will be included.

Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-21 17:05:27 +01:00
mefyl bb3ad64060
Fix .dockerignore: accept wildcard in inclusion pattern, honor last line precedence.
Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-21 17:05:26 +01:00
mefyl c8f5a5ad40
Fix dockerignore handling of absolute path exceptions.
Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-21 17:05:26 +01:00
Joffrey F 8fd9d3c99e GenericResources was introduced in 1.32
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-20 17:11:27 -08:00
Joffrey F f40079d85d Merge branch 'BYU-PCCL-master' 2018-02-20 16:40:55 -08:00
Joffrey F 9b6b306e17 Code cleanup and version guards
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-20 16:25:17 -08:00
William Myers 820de848fa Add support for generic resources to docker.types.Resources
- Add support for dict and list generic_resources parameter
- Add generic_resources integration test

Signed-off-by: William Myers <mwilliammyers@gmail.com>
2018-02-20 16:25:17 -08:00
Joffrey F 759833c174
Merge pull request #1919 from docker/1912-pull-sha-tag
Fix DockerClient pull bug when pulling image by digest
2018-02-20 15:01:13 -08:00
Joffrey F cc455d7fd5 Fix DockerClient pull bug when pulling image by digest
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-20 14:51:49 -08:00
mefyl 181c1c8eb9 Revert "Correctly support absolute paths in .dockerignore"
This reverts commit 34d50483e2.

Signed-off-by: mefyl <quentin.hocquet@docker.com>
2018-02-19 13:37:35 +01:00
Joffrey F ba0e5332de
Merge pull request #1910 from docker/bump_credstore
Bump docker-pycreds to 0.2.2 (pass support)
2018-02-14 16:25:42 -08:00
Joffrey F 4c708f568c Fix test_login flakes
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-14 16:22:33 -08:00
Joffrey F 08803743c5
Merge pull request #1906 from docker/1352-data_stream_control
Add chunk_size parameter to data downloading methods
2018-02-14 16:22:02 -08:00
Joffrey F 581ccc9f7e Add chunk_size parameter to data downloading methods (export, get_archive, save)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-14 16:07:19 -08:00
Joffrey F dbcf04388a
Merge pull request #1908 from docker/1861-credstore_login
Fix authconfig resolution when credStore is used combined with login()
2018-02-14 16:04:47 -08:00
Joffrey F 5e28dcaace
Merge pull request #1909 from yongtang/somevolume-cleanup
Clean up created volume from test_run_with_named_volume
2018-02-14 16:04:06 -08:00
Joffrey F 15ae1f09f8 Bump docker-pycreds to 0.2.2 (pass support)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-14 16:02:04 -08:00
Yong Tang cbbc37ac7b Clean up created volume from test_run_with_named_volume
This fix adds the volume id to the list so that it could be
cleaned up on test teardown.

The issue was originally from https://github.com/moby/moby/pull/36292
where an additional `somevolume` pre-exists in tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-14 13:01:16 +00:00
Joffrey F 3498b63fb0 Fix authconfig resolution when credStore is used combined with login()
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-13 18:55:56 -08:00
Joffrey F 14eec99bed
Merge pull request #1907 from docker/c5622_device_cgroup_rules
Add support for device_cgroup_rules parameter in host config
2018-02-13 17:18:36 -08:00
Joffrey F 48e45afe88 Add support for device_cgroup_rules parameter in host config
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-13 17:05:16 -08:00
Joffrey F 9e75609aec
Merge pull request #1904 from docker/c5672-dockerignore-abspath
Correctly support absolute paths in .dockerignore
2018-02-12 15:44:58 -08:00
Joffrey F 34d50483e2 Correctly support absolute paths in .dockerignore
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-12 14:59:41 -08:00
Joffrey F c9ee0222fa
Merge pull request #1902 from docker/3.0.1-release
3.0.1 release
2018-02-05 14:09:37 -08:00
Joffrey F 8649f48a4c Bump 3.0.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 13:44:57 -08:00
Joffrey F 6de7bab22f Rewrite access check in create_archive with EAFP
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 13:38:32 -08:00
Joffrey F 539b321bd1 Add login data to the right subdict in auth_configs
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 13:38:19 -08:00
Joffrey F a60011ca3a Add workaround for bpo-32713
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 13:38:03 -08:00
Joffrey F 7c19772eb6
Merge pull request #1901 from docker/1899-create_archive_fix
Rewrite access check in create_archive with EAFP
2018-02-05 13:37:01 -08:00
Joffrey F 58639aecfa Rewrite access check in create_archive with EAFP
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 13:11:19 -08:00
Joffrey F 855b71eabe
Merge pull request #1896 from docker/1895-login-auths
Add login data to the right subdict in auth_configs
2018-02-02 10:29:33 -08:00
Joffrey F f00e76cac9
Merge pull request #1897 from docker/c5618-negative-mtime-tar
Add workaround for bpo-32713
2018-02-01 17:12:45 -08:00
Joffrey F 04bf470f6e Add workaround for bpo-32713
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 16:51:36 -08:00
Joffrey F 83d185d695 Add login data to the right subdict in auth_configs
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 16:02:09 -08:00
Joffrey F 05d34ed1fb 3.1.0-dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-31 17:58:23 -08:00