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
Sebastiaan van Stijn 2c8018f4bd
Use commit-sha instead of tag for containerd
The `docker info` command compares the installed version
of containerd using a Git-sha. We currently use a tag for
this, but that tag is not returned by the version-API of
containerd, resulting in the `docker info` output to show:

    containerd version: 89623f28b87a6004d4b785663257362d1658a729 (expected: v1.0.0)

This patch changes the `v1.0.0` tag to the commit that
corresponds with the tag, so that the `docker info` output
does not show the `expected:` string.

This should be considered a temporary workaround; the check
for the exact version of containerd that's installed was needed
when we still used the 0.2.x branch, because it did not have
stable releases yet.

With containerd reaching 1.0, and using SemVer, we can likely
do a comparison for "Major" version, or make this a "packaging"
issue, and remove the check entirely (we can still _print_ the
version that's installed if we think it's usefule).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-12 10:43:56 -08:00
..
checker
cli Separate the GenerateRandomAlphaOnlyString function from stringutils 2017-10-28 09:03:02 +08:00
daemon Added support for swarm service isolation mode 2017-10-30 16:16:18 +01:00
environment Set integration test OSType with environment variable 2017-09-20 19:50:17 +02:00
fixtures integration/plugin/authz: port tests from integration-cli 2017-10-02 14:20:59 +01:00
registry
request Set client version instead of negotiating it 2017-09-14 19:27:09 +02:00
requirement Refactor test environment 2017-08-30 13:13:18 -04:00
benchmark_test.go
check_test.go [integration-cli] ensureFrozenImages here too 2017-10-24 14:24:25 -04:00
daemon_swarm_hack_test.go
docker_api_attach_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_auth_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_build_test.go Set OS on scratch image and prevent panic if empty 2017-11-06 18:22:15 -08:00
docker_api_containers_test.go Set selinux label on local volumes from mounts API 2017-09-19 10:46:38 -04:00
docker_api_containers_unix_test.go Only chown network files within container metadata 2017-11-01 10:14:01 -04:00
docker_api_containers_windows_test.go Windows: Add named pipe mount support 2017-08-07 11:34:36 -07:00
docker_api_create_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_events_test.go
docker_api_exec_resize_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_exec_test.go libcontainerd: fix leaking container/exec state 2017-11-13 15:48:21 -08:00
docker_api_images_test.go Fixes after dnephin review 2017-09-14 19:27:09 +02:00
docker_api_info_test.go Use commit-sha instead of tag for containerd 2017-12-12 10:43:56 -08:00
docker_api_inspect_test.go Copy Inslice() to those parts that use it 2017-11-10 13:42:38 +08:00
docker_api_inspect_unix_test.go Fixes for dnephin review 2017-09-14 19:27:09 +02:00
docker_api_ipcmode_test.go Typo fixed and simple code. 2017-10-18 10:26:58 +08:00
docker_api_logs_test.go Make TestLogsAPIUntil less flaky 2017-12-11 18:28:29 -08:00
docker_api_network_test.go Merge pull request #35030 from tossmilestone/34459-fix-network-create-conflict-errcode 2017-10-25 14:29:20 +02:00
docker_api_resize_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_session_test.go Remove testutil.ReadBody 2017-08-22 17:15:26 -04:00
docker_api_stats_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_api_stats_unix_test.go
docker_api_swarm_config_test.go Cleanup client not found errors. 2017-09-11 19:53:18 -04:00
docker_api_swarm_node_test.go
docker_api_swarm_secret_test.go Cleanup client not found errors. 2017-09-11 19:53:18 -04:00
docker_api_swarm_service_test.go Explicitly add --detach to service CLI calls 2017-09-27 16:17:55 -07:00
docker_api_swarm_test.go [integration-cli] fix flaky raft test 2017-10-11 14:23:55 -04:00
docker_api_test.go Remove testutil.ReadBody 2017-08-22 17:15:26 -04:00
docker_api_update_unix_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_api_volumes_test.go Various fixes 2017-09-15 16:01:15 +02:00
docker_cli_attach_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_cli_attach_unix_test.go Skip some tests for E2E 2017-09-14 19:27:09 +02:00
docker_cli_build_test.go Separate the GenerateRandomAlphaOnlyString function from stringutils 2017-10-28 09:03:02 +08:00
docker_cli_build_unix_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_cli_by_digest_test.go Copy Inslice() to those parts that use it 2017-11-10 13:42:38 +08:00
docker_cli_commit_test.go *: normalize the use of normalize 2017-08-22 15:25:31 -07:00
docker_cli_config_create_test.go Add integration test coverage for configs 2017-05-11 10:18:44 -07:00
docker_cli_config_inspect_test.go Add integration test coverage for configs 2017-05-11 10:18:44 -07:00
docker_cli_config_ls_test.go Fixes after dnephin review 2017-09-14 19:27:09 +02:00
docker_cli_cp_from_container_test.go Remove a test that was moved to docker/cli 2017-10-30 18:39:11 -04:00
docker_cli_cp_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_cp_to_container_test.go Bump Go to 1.9.2 2017-11-21 20:57:02 +01:00
docker_cli_cp_to_container_unix_test.go
docker_cli_cp_utils_test.go Optimize some wrong usage and spelling 2017-09-07 09:44:08 +08:00
docker_cli_create_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_create_unix_test.go
docker_cli_daemon_plugins_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_daemon_test.go Increase container default shutdown timeout on Windows 2017-10-23 10:31:31 -07:00
docker_cli_diff_test.go
docker_cli_events_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_cli_events_unix_test.go Avoid failing the test if container is already stopped 2017-09-05 17:19:57 +02:00
docker_cli_exec_test.go Fix tests creating zombie processes 2017-10-20 07:11:38 -07: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_export_import_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_external_graphdriver_unix_test.go LCOW: Implemented support for docker cp + build 2017-09-14 12:07:52 -07:00
docker_cli_external_volume_driver_unix_test.go Fixes after dnephin review 2017-09-14 19:27:09 +02:00
docker_cli_health_test.go Fix GitHub spelling 2017-10-07 00:10:24 +08:00
docker_cli_history_test.go
docker_cli_images_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_import_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_info_test.go Remove deprecated support for duplicate label-keys 2017-11-12 03:11:37 +01:00
docker_cli_info_unix_test.go
docker_cli_inspect_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_kill_test.go Fixes for dnephin review 2017-09-14 19:27:09 +02:00
docker_cli_links_test.go Remove testutil.ConvertSliceOfStringsToMap 2017-08-22 17:15:26 -04:00
docker_cli_links_unix_test.go
docker_cli_login_test.go Spelling fixes 2017-07-03 13:13:09 -07:00
docker_cli_logout_test.go Disallow using legacy (V1) registries 2017-12-09 02:24:43 -08:00
docker_cli_logs_bench_test.go
docker_cli_logs_test.go Fix tests creating zombie processes 2017-10-20 07:11:38 -07:00
docker_cli_nat_test.go
docker_cli_netmode_test.go Restore error type in FindNetwork 2017-11-29 11:22:57 -08:00
docker_cli_network_unix_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_cli_oom_killed_test.go
docker_cli_pause_test.go Allow stopping of paused container 2017-07-12 10:35:48 -04:00
docker_cli_plugins_logdriver_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_cli_plugins_test.go Fix potential panic during plugin set. 2017-11-28 13:06:24 -08:00
docker_cli_port_test.go Fixes for dnephin review 2017-09-14 19:27:09 +02:00
docker_cli_proxy_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_prune_unix_test.go Explicitly add --detach to service CLI calls 2017-09-27 16:17:55 -07:00
docker_cli_ps_test.go Various fixes 2017-09-15 16:01:15 +02:00
docker_cli_pull_local_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_pull_test.go Disallow using legacy (V1) registries 2017-12-09 02:24:43 -08:00
docker_cli_pull_trusted_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_push_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_registry_user_agent_test.go Simplify DockerRegistrySuite.TestUserAgentPassThrough() 2017-06-12 20:18:03 +02:00
docker_cli_rename_test.go Remove assertions that were testing CLI behaviour. 2017-08-31 18:19:17 -04:00
docker_cli_restart_test.go
docker_cli_rm_test.go create unit tests for rm (running, paused, restarting) errormessages 2017-04-03 21:58:05 +02:00
docker_cli_rmi_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_run_test.go Disable TestRunServicingContainer on RS4+ builds 2017-11-28 10:29:43 -08:00
docker_cli_run_unix_test.go Fix tests creating zombie processes 2017-10-20 07:11:38 -07:00
docker_cli_save_load_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_save_load_unix_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_search_test.go fix some ineffectual assignments 2017-01-24 11:16:19 +01:00
docker_cli_secret_create_test.go
docker_cli_secret_inspect_test.go
docker_cli_secret_ls_test.go
docker_cli_service_create_test.go Explicitly add --detach to service CLI calls 2017-09-27 16:17:55 -07:00
docker_cli_service_health_test.go Update CLI commit hash 2017-05-18 12:23:28 -07:00
docker_cli_service_logs_test.go Fix tests creating zombie processes 2017-10-20 07:11:38 -07:00
docker_cli_service_scale_test.go remove --detach on scale 2017-09-27 17:47:51 -07:00
docker_cli_service_update_test.go Explicitly add --detach to service CLI calls 2017-09-27 16:17:55 -07:00
docker_cli_sni_test.go Disable flakey TestClientSetsTLSServerName 2016-02-02 19:56:31 -08:00
docker_cli_start_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_stats_test.go Fix tests creating zombie processes 2017-10-20 07:11:38 -07:00
docker_cli_stop_test.go
docker_cli_swarm_test.go Change TestSwarmServiceTTY to only verify running containers since with swarmkit#b187b24 service deletions/scale-downs don't directly remove the container. 2017-12-05 14:51:14 -08:00
docker_cli_swarm_unix_test.go Added support for swarm service isolation mode 2017-10-30 16:16:18 +01:00
docker_cli_tag_test.go Separate the GenerateRandomAlphaOnlyString function from stringutils 2017-10-28 09:03:02 +08:00
docker_cli_top_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_update_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_cli_update_unix_test.go [integration-cli] fix s390x flaky test 2017-10-03 12:13:29 -04:00
docker_cli_userns_test.go Remove RunCommandPipelineWithOutput 2017-08-22 17:15:26 -04:00
docker_cli_v2_only_test.go Disallow using legacy (V1) registries 2017-12-09 02:24:43 -08:00
docker_cli_volume_test.go Various fixes 2017-09-15 16:01:15 +02:00
docker_cli_wait_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_deprecated_api_v124_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
docker_deprecated_api_v124_unix_test.go Stop using deprecated SockRequest 2017-08-23 17:10:04 -04:00
docker_experimental_network_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
docker_hub_pull_suite_test.go Fixes after dnephin review 2017-09-14 19:27:09 +02:00
docker_utils_test.go Fixes for dnephin review 2017-09-14 19:27:09 +02:00
events_utils_test.go Update libcontainerd to use containerd 1.0 2017-10-20 07:11:37 -07:00
fixtures_linux_daemon_test.go TestRunSeccompProfileAllow32Bit: fix 2017-09-17 22:04:31 -07:00
requirements_test.go Merge pull request #34911 from dnephin/new-ci-entrypoint 2017-09-26 11:50:44 -07:00
requirements_unix_test.go Check integration test requirements using daemon 2017-09-14 19:27:09 +02: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
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
trust_server_test.go Update tests to use icmd 2017-08-25 12:07:30 -04:00
utils_test.go Separate the GenerateRandomAlphaOnlyString function from stringutils 2017-10-28 09:03:02 +08:00