p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
3229d5a2cbd3cfe48bf10ef87cf748df4660c9fd
docker-cli/components/engine/integration-cli
History
Yong Tang 3229d5a2cb Fix issues of multiple published ports mapping to the same target port 
This fix tries to address the issue raised in docker/docker-29730
where a service with multiple published ports mapping to the same target
port (e.g., `--publish 5000:80 --publish 5001:80`) can't be allocated.

The reason for the issue is that, `getPortConfigKey` is used for both
allocated ports and configured (may or may not be allocated) ports.
However, `getPortConfigKey` will not take into consideration the
`PublishedPort` field, which actually could be different for different
allocated ports.

This fix saves a map of `portKey:portNum:portState`,  instead of currently
used `portKey:portState` so that multiple published ports could be processed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cb59bd0c5194f3f74cd405a87b562465219cad8a
Component: engine
2017-01-10 00:46:18 -08:00
..
checker
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
daemon
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
environment
Tidy kernel version in tests
2017-01-03 12:47:25 -08:00
fixtures
Add integration test for stack deploy.
2016-11-10 11:28:18 -05:00
registry
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
request
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
requirement
Display only the name of the requirement…
2016-12-26 21:29:17 +01:00
benchmark_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
check_test.go
Add a registry package with registry v1/v2 code
2017-01-02 11:03:53 +01:00
daemon_swarm_hack.go
Extract daemon to its own package
2016-12-09 22:26:42 +01:00
docker_api_attach_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_auth_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_build_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_containers_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_create_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_events_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_exec_resize_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_exec_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_images_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_info_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_inspect_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_inspect_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_logs_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_network_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_resize_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_service_update_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_api_stats_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_stats_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_swarm_test.go
Add test for swarm error handling
2017-01-05 15:46:07 -08:00
docker_api_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_update_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_version_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_volumes_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_attach_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_attach_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_authz_plugin_v2_test.go
Set plugins used in tests back to original names
2017-01-05 13:55:43 -08:00
docker_cli_authz_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_build_test.go
Fix workdir cache invalidation
2017-01-06 12:10:59 -08:00
docker_cli_build_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_by_digest_test.go
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
docker_cli_commit_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_config_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_from_container_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_to_container_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_to_container_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_utils.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_create_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_daemon_plugins_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_daemon_test.go
Add test TestRestartPolicyWithLiveRestore
2017-01-04 14:12:49 -08:00
docker_cli_diff_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_events_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_events_unix_test.go
support registry mirror config reload
2017-01-04 11:04:00 +08:00
docker_cli_exec_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_exec_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_experimental_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_export_import_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_external_graphdriver_unix_test.go
Fix race/deadlock in v1 plugin handlers
2016-12-27 12:27:41 -05:00
docker_cli_external_volume_driver_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_health_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_help_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_history_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_images_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_import_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_info_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_info_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_inspect_test.go
Tidy kernel version in tests
2017-01-03 12:47:25 -08:00
docker_cli_kill_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_links_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_links_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_login_test.go
Merge pull request #29799 from vdemeester/integration-registry-package
2017-01-02 15:37:09 +01:00
docker_cli_logout_test.go
Merge pull request #29799 from vdemeester/integration-registry-package
2017-01-02 15:37:09 +01:00
docker_cli_logs_bench_test.go
Fixes some issues with jsonfile write/read
2016-03-21 11:05:58 -04:00
docker_cli_logs_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_nat_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_netmode_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_network_unix_test.go
Set plugins used in tests back to original names
2017-01-05 13:55:43 -08:00
docker_cli_oom_killed_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_pause_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_plugins_test.go
Set plugins used in tests back to original names
2017-01-05 13:55:43 -08:00
docker_cli_port_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_proxy_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_prune_unix_test.go
Add --filter until=<timestamp> for docker container/image prune
2017-01-04 14:16:42 -08:00
docker_cli_ps_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_pull_local_test.go
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
docker_cli_pull_test.go
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
docker_cli_pull_trusted_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_push_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_registry_user_agent_test.go
Add a registry package with registry v1/v2 code
2017-01-02 11:03:53 +01:00
docker_cli_rename_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_restart_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_rm_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_rmi_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_run_test.go
Merge pull request #29827 from vdemeester/integration-fixes-for-userns
2017-01-03 11:47:39 +01:00
docker_cli_run_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_save_load_test.go
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
docker_cli_save_load_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_search_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_secret_create_test.go
remove -f on secret create and unify usage with other commands
2017-01-06 14:07:48 -08:00
docker_cli_secret_inspect_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_create_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_health_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_logs_experimental_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_scale_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_update_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_sni_test.go
Disable flakey TestClientSetsTLSServerName
2016-02-02 19:56:31 -08:00
docker_cli_stack_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_start_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_stats_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_stop_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_swarm_test.go
Fix issues of multiple published ports mapping to the same target port
2017-01-10 00:46:18 -08:00
docker_cli_swarm_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_tag_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_top_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_update_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_update_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_userns_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_v2_only_test.go
Add a registry package with registry v1/v2 code
2017-01-02 11:03:53 +01:00
docker_cli_version_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_volume_test.go
fix volume ls filter driver
2017-01-04 23:29:12 +08:00
docker_cli_wait_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_deprecated_api_v124_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_deprecated_api_v124_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_experimental_network_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_hub_pull_suite_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_utils_test.go
Merge pull request #29795 from vdemeester/integration-request-package
2017-01-09 14:51:40 +01:00
events_utils_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
fixtures_linux_daemon_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
fixtures_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
requirements_test.go
Add a registry package with registry v1/v2 code
2017-01-02 11:03:53 +01:00
requirements_unix_test.go
Refactor and extract TestRequire functionality
2016-12-21 22:39:33 +01:00
test_vars_exec_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_noexec_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_noseccomp_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_seccomp_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_unix_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_windows_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
trust_server_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
utils_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00