1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/integration-cli
Tibor Vass 99cd23cefd Revert "Remove the rest of v1 manifest support"
This reverts commit 98fc09128b in order to
keep registry v2 schema1 handling and libtrust-key-based engine ID.

Because registry v2 schema1 was not officially deprecated and
registries are still relying on it, this patch puts its logic back.

However, registry v1 relics are not added back since v1 logic has been
removed a while ago.

This also fixes an engine upgrade issue in a swarm cluster. It was relying
on the Engine ID to be the same upon upgrade, but the mentioned commit
modified the logic to use UUID and from a different file.

Since the libtrust key is always needed to support v2 schema1 pushes,
that the old engine ID is based on the libtrust key, and that the engine ID
needs to be conserved across upgrades, adding a UUID-based engine ID logic
seems to add more complexity than it solves the problems.

Hence reverting the engine ID changes as well.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f695e98cb7)
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-18 18:54:57 +00:00
..
checker Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
cli Update tests to use gotest.tools 👼 2018-06-13 09:04:30 +02:00
daemon Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
environment Various code-cleanup 2018-05-23 17:50:54 +02:00
fixtures Clean some integration-cli/fixtures package/files 2018-04-16 10:48:58 +02:00
requirement Add canonical import comment 2018-02-05 16:51:57 -05:00
testdata Clean some integration-cli/fixtures package/files 2018-04-16 10:48:58 +02:00
benchmark_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
check_test.go Revert "Remove Schema1 integration test suite" 2019-06-18 18:54:45 +00:00
daemon_swarm_hack_test.go Make internal/test/daemon.Daemon swarm aware 2018-04-11 12:10:17 +02:00
docker_api_attach_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_build_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_build_windows_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_containers_test.go Remove TestContainerAPICreateWithHostName 2019-05-13 15:25:25 -07:00
docker_api_containers_windows_test.go Remove SameHostDaemon, use testEnv.IsLocalDaemon instead 2018-12-24 13:25:53 +01:00
docker_api_exec_resize_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_exec_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_images_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_inspect_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_logs_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_network_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_stats_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_swarm_node_test.go Slightly speed up TestAPISwarmNodeDrainPause 2019-01-13 21:08:20 +01:00
docker_api_swarm_service_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_swarm_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_api_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_attach_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_attach_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_build_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_build_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_by_digest_test.go Revert "Remove Schema1 integration test suite" 2019-06-18 18:54:45 +00:00
docker_cli_commit_test.go Fix ineffassign linting 2018-07-11 22:18:45 +02:00
docker_cli_cp_from_container_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_cp_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_cp_to_container_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_cp_to_container_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_cp_utils_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_create_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_daemon_plugins_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_daemon_test.go Revert "Remove the rest of v1 manifest support" 2019-06-18 18:54:57 +00:00
docker_cli_events_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_events_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_exec_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_exec_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_external_volume_driver_unix_test.go Entropy cannot be saved 2019-06-11 17:40:09 +02:00
docker_cli_health_test.go Fix ineffassign linting 2018-07-11 22:18:45 +02:00
docker_cli_history_test.go
docker_cli_images_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_import_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_info_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_info_unix_test.go Remove SameHostDaemon, use testEnv.IsLocalDaemon instead 2018-12-24 13:25:53 +01:00
docker_cli_inspect_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_links_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_login_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_logout_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_logs_bench_test.go
docker_cli_logs_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_netmode_test.go fix and skip some tests based on API version 2018-05-15 16:05:04 -07:00
docker_cli_network_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_plugins_logdriver_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_plugins_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_port_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_proxy_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_prune_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_ps_test.go Harden TestPsListContainersFilterExited 2019-06-07 14:13:23 +02:00
docker_cli_pull_local_test.go Revert "Remove Schema1 integration test suite" 2019-06-18 18:54:45 +00:00
docker_cli_pull_test.go Use current windows servercore image 2019-04-17 15:24:23 +02:00
docker_cli_push_test.go use gotest.tools assertions in docker_cli_push_test.go 2019-06-18 18:54:55 +00:00
docker_cli_registry_user_agent_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_restart_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_rmi_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_run_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_run_unix_test.go Update TestRunWithDaemonDefaultSeccompProfile for ARM64 2019-05-22 13:33:18 +02:00
docker_cli_save_load_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_save_load_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_search_test.go Remove TestSearchCmdOptions test 2019-05-23 10:58:06 +02:00
docker_cli_service_create_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_service_health_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_service_logs_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_service_scale_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_sni_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_start_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_stats_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_swarm_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_swarm_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_top_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_update_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_userns_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_v2_only_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_cli_volume_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_deprecated_api_v124_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_deprecated_api_v124_unix_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
docker_hub_pull_suite_test.go Remove SameHostDaemon, use testEnv.IsLocalDaemon instead 2018-12-24 13:25:53 +01:00
docker_utils_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
events_utils_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
fixtures_linux_daemon_test.go Replace some checkers and assertions with gotest.tools 2019-04-05 16:45:37 +02:00
requirements_test.go Remove use of deprecated client.NewEnvClient() 2019-01-03 22:49:00 +01:00
requirements_unix_test.go Skip kernel-memory tests on RHEL/CentOS daemons 2019-01-04 13:27:46 +01:00
test_vars_exec_test.go
test_vars_noexec_test.go
test_vars_noseccomp_test.go
test_vars_seccomp_test.go
test_vars_test.go Remove deprecated environment.DaemonPlatform() 2018-01-15 15:32:06 +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
utils_test.go Update tests to use gotest.tools 👼 2018-06-13 09:04:30 +02:00