diff --git a/.github/workflows/validate-upstream.yml b/.github/workflows/validate-upstream.yml index 25a04a61b8..3df3f6cea1 100644 --- a/.github/workflows/validate-upstream.yml +++ b/.github/workflows/validate-upstream.yml @@ -61,7 +61,7 @@ jobs: const yamlSrcFilename = path.basename(yamlSrcPath); const yamlSrcNoExt = yamlSrcPath.replace(".yaml", ""); const hasSubCommands = (await (await glob.create(yamlSrcNoExt)).glob()).length > 1; - const yamlDestPath = path.join('data', `${{ inputs.data-files-folder }}`, yamlSrcFilename); + const yamlDestPath = path.join('data', 'cli', `${{ inputs.data-files-folder }}`, yamlSrcFilename); let placeholderPath = path.join("content/reference/cli", yamlSrcFilename.replace('_', '/').replace(/\.yaml$/, '.md')); if (hasSubCommands) { placeholderPath = placeholderPath.replace('.md', '/_index.md'); diff --git a/content/reference/cli/_content.gotmpl b/content/reference/cli/_content.gotmpl index a7239e0d0e..4827d583b2 100644 --- a/content/reference/cli/_content.gotmpl +++ b/content/reference/cli/_content.gotmpl @@ -18,48 +18,40 @@ so they still appear in the sidebar navigation. */ -}} -{{- $folders := slice - "engine-cli" "buildx" "compose-cli" "model-cli" "mcp-cli" - "sandbox-cli" "offload-cli" "scout-cli" "desktop-cli" - "init-cli" "debug-cli" "secrets-engine" --}} +{{- range $folder, $files := site.Data.cli -}} + {{- range $name, $data := $files -}} + {{- /* Skip hidden commands */ -}} + {{- if $data.hidden -}} + {{- continue -}} + {{- end -}} -{{- range $folder := $folders -}} - {{- with index site.Data $folder -}} - {{- range $name, $data := . -}} - {{- /* Skip hidden commands */ -}} - {{- if $data.hidden -}} - {{- continue -}} - {{- end -}} - - {{- /* Skip alias/shortcut commands: if any alias has more words than - the command, a longer canonical form exists elsewhere. */ -}} - {{- $cmdWords := len (split $data.command " ") -}} - {{- $isAlias := false -}} - {{- with $data.aliases -}} - {{- range (split . ", ") -}} - {{- if gt (len (split . " ")) $cmdWords -}} - {{- $isAlias = true -}} - {{- end -}} + {{- /* Skip alias/shortcut commands: if any alias has more words than + the command, a longer canonical form exists elsewhere. */ -}} + {{- $cmdWords := len (split $data.command " ") -}} + {{- $isAlias := false -}} + {{- with $data.aliases -}} + {{- range (split . ", ") -}} + {{- if gt (len (split . " ")) $cmdWords -}} + {{- $isAlias = true -}} {{- end -}} {{- end -}} - {{- if $isAlias -}} - {{- continue -}} - {{- end -}} - - {{- $path := replace $data.command " " "/" -}} - {{- $kind := "page" -}} - {{- with $data.cname -}} - {{- $kind = "section" -}} - {{- end -}} - - {{- $.AddPage (dict - "path" $path - "title" $data.command - "kind" $kind - "params" (dict "datafolder" $folder "datafile" $name) - ) -}} {{- end -}} + {{- if $isAlias -}} + {{- continue -}} + {{- end -}} + + {{- $path := replace $data.command " " "/" -}} + {{- $kind := "page" -}} + {{- with $data.cname -}} + {{- $kind = "section" -}} + {{- end -}} + + {{- $.AddPage (dict + "path" $path + "title" $data.command + "kind" $kind + "params" (dict "datafolder" $folder "datafile" $name) + ) -}} {{- end -}} {{- end -}} diff --git a/data/buildx/docker_buildx.yaml b/data/cli/buildx/docker_buildx.yaml similarity index 100% rename from data/buildx/docker_buildx.yaml rename to data/cli/buildx/docker_buildx.yaml diff --git a/data/buildx/docker_buildx_bake.yaml b/data/cli/buildx/docker_buildx_bake.yaml similarity index 100% rename from data/buildx/docker_buildx_bake.yaml rename to data/cli/buildx/docker_buildx_bake.yaml diff --git a/data/buildx/docker_buildx_build.yaml b/data/cli/buildx/docker_buildx_build.yaml similarity index 100% rename from data/buildx/docker_buildx_build.yaml rename to data/cli/buildx/docker_buildx_build.yaml diff --git a/data/buildx/docker_buildx_create.yaml b/data/cli/buildx/docker_buildx_create.yaml similarity index 100% rename from data/buildx/docker_buildx_create.yaml rename to data/cli/buildx/docker_buildx_create.yaml diff --git a/data/buildx/docker_buildx_dap.yaml b/data/cli/buildx/docker_buildx_dap.yaml similarity index 100% rename from data/buildx/docker_buildx_dap.yaml rename to data/cli/buildx/docker_buildx_dap.yaml diff --git a/data/buildx/docker_buildx_dap_attach.yaml b/data/cli/buildx/docker_buildx_dap_attach.yaml similarity index 100% rename from data/buildx/docker_buildx_dap_attach.yaml rename to data/cli/buildx/docker_buildx_dap_attach.yaml diff --git a/data/buildx/docker_buildx_dap_build.yaml b/data/cli/buildx/docker_buildx_dap_build.yaml similarity index 100% rename from data/buildx/docker_buildx_dap_build.yaml rename to data/cli/buildx/docker_buildx_dap_build.yaml diff --git a/data/buildx/docker_buildx_debug.yaml b/data/cli/buildx/docker_buildx_debug.yaml similarity index 100% rename from data/buildx/docker_buildx_debug.yaml rename to data/cli/buildx/docker_buildx_debug.yaml diff --git a/data/buildx/docker_buildx_debug_build.yaml b/data/cli/buildx/docker_buildx_debug_build.yaml similarity index 100% rename from data/buildx/docker_buildx_debug_build.yaml rename to data/cli/buildx/docker_buildx_debug_build.yaml diff --git a/data/buildx/docker_buildx_dial-stdio.yaml b/data/cli/buildx/docker_buildx_dial-stdio.yaml similarity index 100% rename from data/buildx/docker_buildx_dial-stdio.yaml rename to data/cli/buildx/docker_buildx_dial-stdio.yaml diff --git a/data/buildx/docker_buildx_du.yaml b/data/cli/buildx/docker_buildx_du.yaml similarity index 100% rename from data/buildx/docker_buildx_du.yaml rename to data/cli/buildx/docker_buildx_du.yaml diff --git a/data/buildx/docker_buildx_history.yaml b/data/cli/buildx/docker_buildx_history.yaml similarity index 100% rename from data/buildx/docker_buildx_history.yaml rename to data/cli/buildx/docker_buildx_history.yaml diff --git a/data/buildx/docker_buildx_history_export.yaml b/data/cli/buildx/docker_buildx_history_export.yaml similarity index 100% rename from data/buildx/docker_buildx_history_export.yaml rename to data/cli/buildx/docker_buildx_history_export.yaml diff --git a/data/buildx/docker_buildx_history_import.yaml b/data/cli/buildx/docker_buildx_history_import.yaml similarity index 100% rename from data/buildx/docker_buildx_history_import.yaml rename to data/cli/buildx/docker_buildx_history_import.yaml diff --git a/data/buildx/docker_buildx_history_inspect.yaml b/data/cli/buildx/docker_buildx_history_inspect.yaml similarity index 100% rename from data/buildx/docker_buildx_history_inspect.yaml rename to data/cli/buildx/docker_buildx_history_inspect.yaml diff --git a/data/buildx/docker_buildx_history_inspect_attachment.yaml b/data/cli/buildx/docker_buildx_history_inspect_attachment.yaml similarity index 100% rename from data/buildx/docker_buildx_history_inspect_attachment.yaml rename to data/cli/buildx/docker_buildx_history_inspect_attachment.yaml diff --git a/data/buildx/docker_buildx_history_logs.yaml b/data/cli/buildx/docker_buildx_history_logs.yaml similarity index 100% rename from data/buildx/docker_buildx_history_logs.yaml rename to data/cli/buildx/docker_buildx_history_logs.yaml diff --git a/data/buildx/docker_buildx_history_ls.yaml b/data/cli/buildx/docker_buildx_history_ls.yaml similarity index 100% rename from data/buildx/docker_buildx_history_ls.yaml rename to data/cli/buildx/docker_buildx_history_ls.yaml diff --git a/data/buildx/docker_buildx_history_open.yaml b/data/cli/buildx/docker_buildx_history_open.yaml similarity index 100% rename from data/buildx/docker_buildx_history_open.yaml rename to data/cli/buildx/docker_buildx_history_open.yaml diff --git a/data/buildx/docker_buildx_history_rm.yaml b/data/cli/buildx/docker_buildx_history_rm.yaml similarity index 100% rename from data/buildx/docker_buildx_history_rm.yaml rename to data/cli/buildx/docker_buildx_history_rm.yaml diff --git a/data/buildx/docker_buildx_history_trace.yaml b/data/cli/buildx/docker_buildx_history_trace.yaml similarity index 100% rename from data/buildx/docker_buildx_history_trace.yaml rename to data/cli/buildx/docker_buildx_history_trace.yaml diff --git a/data/buildx/docker_buildx_imagetools.yaml b/data/cli/buildx/docker_buildx_imagetools.yaml similarity index 100% rename from data/buildx/docker_buildx_imagetools.yaml rename to data/cli/buildx/docker_buildx_imagetools.yaml diff --git a/data/buildx/docker_buildx_imagetools_create.yaml b/data/cli/buildx/docker_buildx_imagetools_create.yaml similarity index 100% rename from data/buildx/docker_buildx_imagetools_create.yaml rename to data/cli/buildx/docker_buildx_imagetools_create.yaml diff --git a/data/buildx/docker_buildx_imagetools_inspect.yaml b/data/cli/buildx/docker_buildx_imagetools_inspect.yaml similarity index 100% rename from data/buildx/docker_buildx_imagetools_inspect.yaml rename to data/cli/buildx/docker_buildx_imagetools_inspect.yaml diff --git a/data/buildx/docker_buildx_inspect.yaml b/data/cli/buildx/docker_buildx_inspect.yaml similarity index 100% rename from data/buildx/docker_buildx_inspect.yaml rename to data/cli/buildx/docker_buildx_inspect.yaml diff --git a/data/buildx/docker_buildx_install.yaml b/data/cli/buildx/docker_buildx_install.yaml similarity index 100% rename from data/buildx/docker_buildx_install.yaml rename to data/cli/buildx/docker_buildx_install.yaml diff --git a/data/buildx/docker_buildx_ls.yaml b/data/cli/buildx/docker_buildx_ls.yaml similarity index 100% rename from data/buildx/docker_buildx_ls.yaml rename to data/cli/buildx/docker_buildx_ls.yaml diff --git a/data/buildx/docker_buildx_policy.yaml b/data/cli/buildx/docker_buildx_policy.yaml similarity index 100% rename from data/buildx/docker_buildx_policy.yaml rename to data/cli/buildx/docker_buildx_policy.yaml diff --git a/data/buildx/docker_buildx_policy_eval.yaml b/data/cli/buildx/docker_buildx_policy_eval.yaml similarity index 100% rename from data/buildx/docker_buildx_policy_eval.yaml rename to data/cli/buildx/docker_buildx_policy_eval.yaml diff --git a/data/buildx/docker_buildx_policy_test.yaml b/data/cli/buildx/docker_buildx_policy_test.yaml similarity index 100% rename from data/buildx/docker_buildx_policy_test.yaml rename to data/cli/buildx/docker_buildx_policy_test.yaml diff --git a/data/buildx/docker_buildx_prune.yaml b/data/cli/buildx/docker_buildx_prune.yaml similarity index 100% rename from data/buildx/docker_buildx_prune.yaml rename to data/cli/buildx/docker_buildx_prune.yaml diff --git a/data/buildx/docker_buildx_rm.yaml b/data/cli/buildx/docker_buildx_rm.yaml similarity index 100% rename from data/buildx/docker_buildx_rm.yaml rename to data/cli/buildx/docker_buildx_rm.yaml diff --git a/data/buildx/docker_buildx_stop.yaml b/data/cli/buildx/docker_buildx_stop.yaml similarity index 100% rename from data/buildx/docker_buildx_stop.yaml rename to data/cli/buildx/docker_buildx_stop.yaml diff --git a/data/buildx/docker_buildx_uninstall.yaml b/data/cli/buildx/docker_buildx_uninstall.yaml similarity index 100% rename from data/buildx/docker_buildx_uninstall.yaml rename to data/cli/buildx/docker_buildx_uninstall.yaml diff --git a/data/buildx/docker_buildx_use.yaml b/data/cli/buildx/docker_buildx_use.yaml similarity index 100% rename from data/buildx/docker_buildx_use.yaml rename to data/cli/buildx/docker_buildx_use.yaml diff --git a/data/buildx/docker_buildx_version.yaml b/data/cli/buildx/docker_buildx_version.yaml similarity index 100% rename from data/buildx/docker_buildx_version.yaml rename to data/cli/buildx/docker_buildx_version.yaml diff --git a/data/debug-cli/docker_debug.yaml b/data/cli/debug/docker_debug.yaml similarity index 100% rename from data/debug-cli/docker_debug.yaml rename to data/cli/debug/docker_debug.yaml diff --git a/data/desktop-cli/docker_desktop.yaml b/data/cli/desktop/docker_desktop.yaml similarity index 100% rename from data/desktop-cli/docker_desktop.yaml rename to data/cli/desktop/docker_desktop.yaml diff --git a/data/desktop-cli/docker_desktop_diagnose.yaml b/data/cli/desktop/docker_desktop_diagnose.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_diagnose.yaml rename to data/cli/desktop/docker_desktop_diagnose.yaml diff --git a/data/desktop-cli/docker_desktop_disable.yaml b/data/cli/desktop/docker_desktop_disable.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_disable.yaml rename to data/cli/desktop/docker_desktop_disable.yaml diff --git a/data/desktop-cli/docker_desktop_disable_model_runner.yaml b/data/cli/desktop/docker_desktop_disable_model_runner.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_disable_model_runner.yaml rename to data/cli/desktop/docker_desktop_disable_model_runner.yaml diff --git a/data/desktop-cli/docker_desktop_enable.yaml b/data/cli/desktop/docker_desktop_enable.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_enable.yaml rename to data/cli/desktop/docker_desktop_enable.yaml diff --git a/data/desktop-cli/docker_desktop_enable_model_runner.yaml b/data/cli/desktop/docker_desktop_enable_model_runner.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_enable_model_runner.yaml rename to data/cli/desktop/docker_desktop_enable_model_runner.yaml diff --git a/data/desktop-cli/docker_desktop_engine.yaml b/data/cli/desktop/docker_desktop_engine.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_engine.yaml rename to data/cli/desktop/docker_desktop_engine.yaml diff --git a/data/desktop-cli/docker_desktop_engine_ls.yaml b/data/cli/desktop/docker_desktop_engine_ls.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_engine_ls.yaml rename to data/cli/desktop/docker_desktop_engine_ls.yaml diff --git a/data/desktop-cli/docker_desktop_engine_use.yaml b/data/cli/desktop/docker_desktop_engine_use.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_engine_use.yaml rename to data/cli/desktop/docker_desktop_engine_use.yaml diff --git a/data/desktop-cli/docker_desktop_kubernetes.yaml b/data/cli/desktop/docker_desktop_kubernetes.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_kubernetes.yaml rename to data/cli/desktop/docker_desktop_kubernetes.yaml diff --git a/data/desktop-cli/docker_desktop_kubernetes_images.yaml b/data/cli/desktop/docker_desktop_kubernetes_images.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_kubernetes_images.yaml rename to data/cli/desktop/docker_desktop_kubernetes_images.yaml diff --git a/data/desktop-cli/docker_desktop_logs.yaml b/data/cli/desktop/docker_desktop_logs.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_logs.yaml rename to data/cli/desktop/docker_desktop_logs.yaml diff --git a/data/desktop-cli/docker_desktop_restart.yaml b/data/cli/desktop/docker_desktop_restart.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_restart.yaml rename to data/cli/desktop/docker_desktop_restart.yaml diff --git a/data/desktop-cli/docker_desktop_start.yaml b/data/cli/desktop/docker_desktop_start.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_start.yaml rename to data/cli/desktop/docker_desktop_start.yaml diff --git a/data/desktop-cli/docker_desktop_status.yaml b/data/cli/desktop/docker_desktop_status.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_status.yaml rename to data/cli/desktop/docker_desktop_status.yaml diff --git a/data/desktop-cli/docker_desktop_stop.yaml b/data/cli/desktop/docker_desktop_stop.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_stop.yaml rename to data/cli/desktop/docker_desktop_stop.yaml diff --git a/data/desktop-cli/docker_desktop_update.yaml b/data/cli/desktop/docker_desktop_update.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_update.yaml rename to data/cli/desktop/docker_desktop_update.yaml diff --git a/data/desktop-cli/docker_desktop_version.yaml b/data/cli/desktop/docker_desktop_version.yaml similarity index 100% rename from data/desktop-cli/docker_desktop_version.yaml rename to data/cli/desktop/docker_desktop_version.yaml diff --git a/data/engine-cli/docker.yaml b/data/cli/engine/docker.yaml similarity index 100% rename from data/engine-cli/docker.yaml rename to data/cli/engine/docker.yaml diff --git a/data/engine-cli/docker_attach.yaml b/data/cli/engine/docker_attach.yaml similarity index 100% rename from data/engine-cli/docker_attach.yaml rename to data/cli/engine/docker_attach.yaml diff --git a/data/engine-cli/docker_bake.yaml b/data/cli/engine/docker_bake.yaml similarity index 100% rename from data/engine-cli/docker_bake.yaml rename to data/cli/engine/docker_bake.yaml diff --git a/data/engine-cli/docker_build.yaml b/data/cli/engine/docker_build.yaml similarity index 100% rename from data/engine-cli/docker_build.yaml rename to data/cli/engine/docker_build.yaml diff --git a/data/engine-cli/docker_builder.yaml b/data/cli/engine/docker_builder.yaml similarity index 100% rename from data/engine-cli/docker_builder.yaml rename to data/cli/engine/docker_builder.yaml diff --git a/data/engine-cli/docker_builder_build.yaml b/data/cli/engine/docker_builder_build.yaml similarity index 100% rename from data/engine-cli/docker_builder_build.yaml rename to data/cli/engine/docker_builder_build.yaml diff --git a/data/engine-cli/docker_builder_prune.yaml b/data/cli/engine/docker_builder_prune.yaml similarity index 100% rename from data/engine-cli/docker_builder_prune.yaml rename to data/cli/engine/docker_builder_prune.yaml diff --git a/data/engine-cli/docker_checkpoint.yaml b/data/cli/engine/docker_checkpoint.yaml similarity index 100% rename from data/engine-cli/docker_checkpoint.yaml rename to data/cli/engine/docker_checkpoint.yaml diff --git a/data/engine-cli/docker_checkpoint_create.yaml b/data/cli/engine/docker_checkpoint_create.yaml similarity index 100% rename from data/engine-cli/docker_checkpoint_create.yaml rename to data/cli/engine/docker_checkpoint_create.yaml diff --git a/data/engine-cli/docker_checkpoint_ls.yaml b/data/cli/engine/docker_checkpoint_ls.yaml similarity index 100% rename from data/engine-cli/docker_checkpoint_ls.yaml rename to data/cli/engine/docker_checkpoint_ls.yaml diff --git a/data/engine-cli/docker_checkpoint_rm.yaml b/data/cli/engine/docker_checkpoint_rm.yaml similarity index 100% rename from data/engine-cli/docker_checkpoint_rm.yaml rename to data/cli/engine/docker_checkpoint_rm.yaml diff --git a/data/engine-cli/docker_commit.yaml b/data/cli/engine/docker_commit.yaml similarity index 100% rename from data/engine-cli/docker_commit.yaml rename to data/cli/engine/docker_commit.yaml diff --git a/data/engine-cli/docker_config.yaml b/data/cli/engine/docker_config.yaml similarity index 100% rename from data/engine-cli/docker_config.yaml rename to data/cli/engine/docker_config.yaml diff --git a/data/engine-cli/docker_config_create.yaml b/data/cli/engine/docker_config_create.yaml similarity index 100% rename from data/engine-cli/docker_config_create.yaml rename to data/cli/engine/docker_config_create.yaml diff --git a/data/engine-cli/docker_config_inspect.yaml b/data/cli/engine/docker_config_inspect.yaml similarity index 100% rename from data/engine-cli/docker_config_inspect.yaml rename to data/cli/engine/docker_config_inspect.yaml diff --git a/data/engine-cli/docker_config_ls.yaml b/data/cli/engine/docker_config_ls.yaml similarity index 100% rename from data/engine-cli/docker_config_ls.yaml rename to data/cli/engine/docker_config_ls.yaml diff --git a/data/engine-cli/docker_config_rm.yaml b/data/cli/engine/docker_config_rm.yaml similarity index 100% rename from data/engine-cli/docker_config_rm.yaml rename to data/cli/engine/docker_config_rm.yaml diff --git a/data/engine-cli/docker_container.yaml b/data/cli/engine/docker_container.yaml similarity index 100% rename from data/engine-cli/docker_container.yaml rename to data/cli/engine/docker_container.yaml diff --git a/data/engine-cli/docker_container_attach.yaml b/data/cli/engine/docker_container_attach.yaml similarity index 100% rename from data/engine-cli/docker_container_attach.yaml rename to data/cli/engine/docker_container_attach.yaml diff --git a/data/engine-cli/docker_container_commit.yaml b/data/cli/engine/docker_container_commit.yaml similarity index 100% rename from data/engine-cli/docker_container_commit.yaml rename to data/cli/engine/docker_container_commit.yaml diff --git a/data/engine-cli/docker_container_cp.yaml b/data/cli/engine/docker_container_cp.yaml similarity index 100% rename from data/engine-cli/docker_container_cp.yaml rename to data/cli/engine/docker_container_cp.yaml diff --git a/data/engine-cli/docker_container_create.yaml b/data/cli/engine/docker_container_create.yaml similarity index 100% rename from data/engine-cli/docker_container_create.yaml rename to data/cli/engine/docker_container_create.yaml diff --git a/data/engine-cli/docker_container_diff.yaml b/data/cli/engine/docker_container_diff.yaml similarity index 100% rename from data/engine-cli/docker_container_diff.yaml rename to data/cli/engine/docker_container_diff.yaml diff --git a/data/engine-cli/docker_container_exec.yaml b/data/cli/engine/docker_container_exec.yaml similarity index 100% rename from data/engine-cli/docker_container_exec.yaml rename to data/cli/engine/docker_container_exec.yaml diff --git a/data/engine-cli/docker_container_export.yaml b/data/cli/engine/docker_container_export.yaml similarity index 100% rename from data/engine-cli/docker_container_export.yaml rename to data/cli/engine/docker_container_export.yaml diff --git a/data/engine-cli/docker_container_inspect.yaml b/data/cli/engine/docker_container_inspect.yaml similarity index 100% rename from data/engine-cli/docker_container_inspect.yaml rename to data/cli/engine/docker_container_inspect.yaml diff --git a/data/engine-cli/docker_container_kill.yaml b/data/cli/engine/docker_container_kill.yaml similarity index 100% rename from data/engine-cli/docker_container_kill.yaml rename to data/cli/engine/docker_container_kill.yaml diff --git a/data/engine-cli/docker_container_logs.yaml b/data/cli/engine/docker_container_logs.yaml similarity index 100% rename from data/engine-cli/docker_container_logs.yaml rename to data/cli/engine/docker_container_logs.yaml diff --git a/data/engine-cli/docker_container_ls.yaml b/data/cli/engine/docker_container_ls.yaml similarity index 100% rename from data/engine-cli/docker_container_ls.yaml rename to data/cli/engine/docker_container_ls.yaml diff --git a/data/engine-cli/docker_container_pause.yaml b/data/cli/engine/docker_container_pause.yaml similarity index 100% rename from data/engine-cli/docker_container_pause.yaml rename to data/cli/engine/docker_container_pause.yaml diff --git a/data/engine-cli/docker_container_port.yaml b/data/cli/engine/docker_container_port.yaml similarity index 100% rename from data/engine-cli/docker_container_port.yaml rename to data/cli/engine/docker_container_port.yaml diff --git a/data/engine-cli/docker_container_prune.yaml b/data/cli/engine/docker_container_prune.yaml similarity index 100% rename from data/engine-cli/docker_container_prune.yaml rename to data/cli/engine/docker_container_prune.yaml diff --git a/data/engine-cli/docker_container_rename.yaml b/data/cli/engine/docker_container_rename.yaml similarity index 100% rename from data/engine-cli/docker_container_rename.yaml rename to data/cli/engine/docker_container_rename.yaml diff --git a/data/engine-cli/docker_container_restart.yaml b/data/cli/engine/docker_container_restart.yaml similarity index 100% rename from data/engine-cli/docker_container_restart.yaml rename to data/cli/engine/docker_container_restart.yaml diff --git a/data/engine-cli/docker_container_rm.yaml b/data/cli/engine/docker_container_rm.yaml similarity index 100% rename from data/engine-cli/docker_container_rm.yaml rename to data/cli/engine/docker_container_rm.yaml diff --git a/data/engine-cli/docker_container_run.yaml b/data/cli/engine/docker_container_run.yaml similarity index 100% rename from data/engine-cli/docker_container_run.yaml rename to data/cli/engine/docker_container_run.yaml diff --git a/data/engine-cli/docker_container_start.yaml b/data/cli/engine/docker_container_start.yaml similarity index 100% rename from data/engine-cli/docker_container_start.yaml rename to data/cli/engine/docker_container_start.yaml diff --git a/data/engine-cli/docker_container_stats.yaml b/data/cli/engine/docker_container_stats.yaml similarity index 100% rename from data/engine-cli/docker_container_stats.yaml rename to data/cli/engine/docker_container_stats.yaml diff --git a/data/engine-cli/docker_container_stop.yaml b/data/cli/engine/docker_container_stop.yaml similarity index 100% rename from data/engine-cli/docker_container_stop.yaml rename to data/cli/engine/docker_container_stop.yaml diff --git a/data/engine-cli/docker_container_top.yaml b/data/cli/engine/docker_container_top.yaml similarity index 100% rename from data/engine-cli/docker_container_top.yaml rename to data/cli/engine/docker_container_top.yaml diff --git a/data/engine-cli/docker_container_unpause.yaml b/data/cli/engine/docker_container_unpause.yaml similarity index 100% rename from data/engine-cli/docker_container_unpause.yaml rename to data/cli/engine/docker_container_unpause.yaml diff --git a/data/engine-cli/docker_container_update.yaml b/data/cli/engine/docker_container_update.yaml similarity index 100% rename from data/engine-cli/docker_container_update.yaml rename to data/cli/engine/docker_container_update.yaml diff --git a/data/engine-cli/docker_container_wait.yaml b/data/cli/engine/docker_container_wait.yaml similarity index 100% rename from data/engine-cli/docker_container_wait.yaml rename to data/cli/engine/docker_container_wait.yaml diff --git a/data/engine-cli/docker_context.yaml b/data/cli/engine/docker_context.yaml similarity index 100% rename from data/engine-cli/docker_context.yaml rename to data/cli/engine/docker_context.yaml diff --git a/data/engine-cli/docker_context_create.yaml b/data/cli/engine/docker_context_create.yaml similarity index 100% rename from data/engine-cli/docker_context_create.yaml rename to data/cli/engine/docker_context_create.yaml diff --git a/data/engine-cli/docker_context_export.yaml b/data/cli/engine/docker_context_export.yaml similarity index 100% rename from data/engine-cli/docker_context_export.yaml rename to data/cli/engine/docker_context_export.yaml diff --git a/data/engine-cli/docker_context_import.yaml b/data/cli/engine/docker_context_import.yaml similarity index 100% rename from data/engine-cli/docker_context_import.yaml rename to data/cli/engine/docker_context_import.yaml diff --git a/data/engine-cli/docker_context_inspect.yaml b/data/cli/engine/docker_context_inspect.yaml similarity index 100% rename from data/engine-cli/docker_context_inspect.yaml rename to data/cli/engine/docker_context_inspect.yaml diff --git a/data/engine-cli/docker_context_ls.yaml b/data/cli/engine/docker_context_ls.yaml similarity index 100% rename from data/engine-cli/docker_context_ls.yaml rename to data/cli/engine/docker_context_ls.yaml diff --git a/data/engine-cli/docker_context_rm.yaml b/data/cli/engine/docker_context_rm.yaml similarity index 100% rename from data/engine-cli/docker_context_rm.yaml rename to data/cli/engine/docker_context_rm.yaml diff --git a/data/engine-cli/docker_context_show.yaml b/data/cli/engine/docker_context_show.yaml similarity index 100% rename from data/engine-cli/docker_context_show.yaml rename to data/cli/engine/docker_context_show.yaml diff --git a/data/engine-cli/docker_context_update.yaml b/data/cli/engine/docker_context_update.yaml similarity index 100% rename from data/engine-cli/docker_context_update.yaml rename to data/cli/engine/docker_context_update.yaml diff --git a/data/engine-cli/docker_context_use.yaml b/data/cli/engine/docker_context_use.yaml similarity index 100% rename from data/engine-cli/docker_context_use.yaml rename to data/cli/engine/docker_context_use.yaml diff --git a/data/engine-cli/docker_cp.yaml b/data/cli/engine/docker_cp.yaml similarity index 100% rename from data/engine-cli/docker_cp.yaml rename to data/cli/engine/docker_cp.yaml diff --git a/data/engine-cli/docker_create.yaml b/data/cli/engine/docker_create.yaml similarity index 100% rename from data/engine-cli/docker_create.yaml rename to data/cli/engine/docker_create.yaml diff --git a/data/engine-cli/docker_diff.yaml b/data/cli/engine/docker_diff.yaml similarity index 100% rename from data/engine-cli/docker_diff.yaml rename to data/cli/engine/docker_diff.yaml diff --git a/data/engine-cli/docker_events.yaml b/data/cli/engine/docker_events.yaml similarity index 100% rename from data/engine-cli/docker_events.yaml rename to data/cli/engine/docker_events.yaml diff --git a/data/engine-cli/docker_exec.yaml b/data/cli/engine/docker_exec.yaml similarity index 100% rename from data/engine-cli/docker_exec.yaml rename to data/cli/engine/docker_exec.yaml diff --git a/data/engine-cli/docker_export.yaml b/data/cli/engine/docker_export.yaml similarity index 100% rename from data/engine-cli/docker_export.yaml rename to data/cli/engine/docker_export.yaml diff --git a/data/engine-cli/docker_history.yaml b/data/cli/engine/docker_history.yaml similarity index 100% rename from data/engine-cli/docker_history.yaml rename to data/cli/engine/docker_history.yaml diff --git a/data/engine-cli/docker_image.yaml b/data/cli/engine/docker_image.yaml similarity index 100% rename from data/engine-cli/docker_image.yaml rename to data/cli/engine/docker_image.yaml diff --git a/data/engine-cli/docker_image_build.yaml b/data/cli/engine/docker_image_build.yaml similarity index 100% rename from data/engine-cli/docker_image_build.yaml rename to data/cli/engine/docker_image_build.yaml diff --git a/data/engine-cli/docker_image_history.yaml b/data/cli/engine/docker_image_history.yaml similarity index 100% rename from data/engine-cli/docker_image_history.yaml rename to data/cli/engine/docker_image_history.yaml diff --git a/data/engine-cli/docker_image_import.yaml b/data/cli/engine/docker_image_import.yaml similarity index 100% rename from data/engine-cli/docker_image_import.yaml rename to data/cli/engine/docker_image_import.yaml diff --git a/data/engine-cli/docker_image_inspect.yaml b/data/cli/engine/docker_image_inspect.yaml similarity index 100% rename from data/engine-cli/docker_image_inspect.yaml rename to data/cli/engine/docker_image_inspect.yaml diff --git a/data/engine-cli/docker_image_load.yaml b/data/cli/engine/docker_image_load.yaml similarity index 100% rename from data/engine-cli/docker_image_load.yaml rename to data/cli/engine/docker_image_load.yaml diff --git a/data/engine-cli/docker_image_ls.yaml b/data/cli/engine/docker_image_ls.yaml similarity index 100% rename from data/engine-cli/docker_image_ls.yaml rename to data/cli/engine/docker_image_ls.yaml diff --git a/data/engine-cli/docker_image_prune.yaml b/data/cli/engine/docker_image_prune.yaml similarity index 100% rename from data/engine-cli/docker_image_prune.yaml rename to data/cli/engine/docker_image_prune.yaml diff --git a/data/engine-cli/docker_image_pull.yaml b/data/cli/engine/docker_image_pull.yaml similarity index 100% rename from data/engine-cli/docker_image_pull.yaml rename to data/cli/engine/docker_image_pull.yaml diff --git a/data/engine-cli/docker_image_push.yaml b/data/cli/engine/docker_image_push.yaml similarity index 100% rename from data/engine-cli/docker_image_push.yaml rename to data/cli/engine/docker_image_push.yaml diff --git a/data/engine-cli/docker_image_rm.yaml b/data/cli/engine/docker_image_rm.yaml similarity index 100% rename from data/engine-cli/docker_image_rm.yaml rename to data/cli/engine/docker_image_rm.yaml diff --git a/data/engine-cli/docker_image_save.yaml b/data/cli/engine/docker_image_save.yaml similarity index 100% rename from data/engine-cli/docker_image_save.yaml rename to data/cli/engine/docker_image_save.yaml diff --git a/data/engine-cli/docker_image_tag.yaml b/data/cli/engine/docker_image_tag.yaml similarity index 100% rename from data/engine-cli/docker_image_tag.yaml rename to data/cli/engine/docker_image_tag.yaml diff --git a/data/engine-cli/docker_images.yaml b/data/cli/engine/docker_images.yaml similarity index 100% rename from data/engine-cli/docker_images.yaml rename to data/cli/engine/docker_images.yaml diff --git a/data/engine-cli/docker_import.yaml b/data/cli/engine/docker_import.yaml similarity index 100% rename from data/engine-cli/docker_import.yaml rename to data/cli/engine/docker_import.yaml diff --git a/data/engine-cli/docker_info.yaml b/data/cli/engine/docker_info.yaml similarity index 100% rename from data/engine-cli/docker_info.yaml rename to data/cli/engine/docker_info.yaml diff --git a/data/engine-cli/docker_inspect.yaml b/data/cli/engine/docker_inspect.yaml similarity index 100% rename from data/engine-cli/docker_inspect.yaml rename to data/cli/engine/docker_inspect.yaml diff --git a/data/engine-cli/docker_kill.yaml b/data/cli/engine/docker_kill.yaml similarity index 100% rename from data/engine-cli/docker_kill.yaml rename to data/cli/engine/docker_kill.yaml diff --git a/data/engine-cli/docker_load.yaml b/data/cli/engine/docker_load.yaml similarity index 100% rename from data/engine-cli/docker_load.yaml rename to data/cli/engine/docker_load.yaml diff --git a/data/engine-cli/docker_login.yaml b/data/cli/engine/docker_login.yaml similarity index 100% rename from data/engine-cli/docker_login.yaml rename to data/cli/engine/docker_login.yaml diff --git a/data/engine-cli/docker_logout.yaml b/data/cli/engine/docker_logout.yaml similarity index 100% rename from data/engine-cli/docker_logout.yaml rename to data/cli/engine/docker_logout.yaml diff --git a/data/engine-cli/docker_logs.yaml b/data/cli/engine/docker_logs.yaml similarity index 100% rename from data/engine-cli/docker_logs.yaml rename to data/cli/engine/docker_logs.yaml diff --git a/data/engine-cli/docker_manifest.yaml b/data/cli/engine/docker_manifest.yaml similarity index 100% rename from data/engine-cli/docker_manifest.yaml rename to data/cli/engine/docker_manifest.yaml diff --git a/data/engine-cli/docker_manifest_annotate.yaml b/data/cli/engine/docker_manifest_annotate.yaml similarity index 100% rename from data/engine-cli/docker_manifest_annotate.yaml rename to data/cli/engine/docker_manifest_annotate.yaml diff --git a/data/engine-cli/docker_manifest_create.yaml b/data/cli/engine/docker_manifest_create.yaml similarity index 100% rename from data/engine-cli/docker_manifest_create.yaml rename to data/cli/engine/docker_manifest_create.yaml diff --git a/data/engine-cli/docker_manifest_inspect.yaml b/data/cli/engine/docker_manifest_inspect.yaml similarity index 100% rename from data/engine-cli/docker_manifest_inspect.yaml rename to data/cli/engine/docker_manifest_inspect.yaml diff --git a/data/engine-cli/docker_manifest_push.yaml b/data/cli/engine/docker_manifest_push.yaml similarity index 100% rename from data/engine-cli/docker_manifest_push.yaml rename to data/cli/engine/docker_manifest_push.yaml diff --git a/data/engine-cli/docker_manifest_rm.yaml b/data/cli/engine/docker_manifest_rm.yaml similarity index 100% rename from data/engine-cli/docker_manifest_rm.yaml rename to data/cli/engine/docker_manifest_rm.yaml diff --git a/data/engine-cli/docker_network.yaml b/data/cli/engine/docker_network.yaml similarity index 100% rename from data/engine-cli/docker_network.yaml rename to data/cli/engine/docker_network.yaml diff --git a/data/engine-cli/docker_network_connect.yaml b/data/cli/engine/docker_network_connect.yaml similarity index 100% rename from data/engine-cli/docker_network_connect.yaml rename to data/cli/engine/docker_network_connect.yaml diff --git a/data/engine-cli/docker_network_create.yaml b/data/cli/engine/docker_network_create.yaml similarity index 100% rename from data/engine-cli/docker_network_create.yaml rename to data/cli/engine/docker_network_create.yaml diff --git a/data/engine-cli/docker_network_disconnect.yaml b/data/cli/engine/docker_network_disconnect.yaml similarity index 100% rename from data/engine-cli/docker_network_disconnect.yaml rename to data/cli/engine/docker_network_disconnect.yaml diff --git a/data/engine-cli/docker_network_inspect.yaml b/data/cli/engine/docker_network_inspect.yaml similarity index 100% rename from data/engine-cli/docker_network_inspect.yaml rename to data/cli/engine/docker_network_inspect.yaml diff --git a/data/engine-cli/docker_network_ls.yaml b/data/cli/engine/docker_network_ls.yaml similarity index 100% rename from data/engine-cli/docker_network_ls.yaml rename to data/cli/engine/docker_network_ls.yaml diff --git a/data/engine-cli/docker_network_prune.yaml b/data/cli/engine/docker_network_prune.yaml similarity index 100% rename from data/engine-cli/docker_network_prune.yaml rename to data/cli/engine/docker_network_prune.yaml diff --git a/data/engine-cli/docker_network_rm.yaml b/data/cli/engine/docker_network_rm.yaml similarity index 100% rename from data/engine-cli/docker_network_rm.yaml rename to data/cli/engine/docker_network_rm.yaml diff --git a/data/engine-cli/docker_node.yaml b/data/cli/engine/docker_node.yaml similarity index 100% rename from data/engine-cli/docker_node.yaml rename to data/cli/engine/docker_node.yaml diff --git a/data/engine-cli/docker_node_demote.yaml b/data/cli/engine/docker_node_demote.yaml similarity index 100% rename from data/engine-cli/docker_node_demote.yaml rename to data/cli/engine/docker_node_demote.yaml diff --git a/data/engine-cli/docker_node_inspect.yaml b/data/cli/engine/docker_node_inspect.yaml similarity index 100% rename from data/engine-cli/docker_node_inspect.yaml rename to data/cli/engine/docker_node_inspect.yaml diff --git a/data/engine-cli/docker_node_ls.yaml b/data/cli/engine/docker_node_ls.yaml similarity index 100% rename from data/engine-cli/docker_node_ls.yaml rename to data/cli/engine/docker_node_ls.yaml diff --git a/data/engine-cli/docker_node_promote.yaml b/data/cli/engine/docker_node_promote.yaml similarity index 100% rename from data/engine-cli/docker_node_promote.yaml rename to data/cli/engine/docker_node_promote.yaml diff --git a/data/engine-cli/docker_node_ps.yaml b/data/cli/engine/docker_node_ps.yaml similarity index 100% rename from data/engine-cli/docker_node_ps.yaml rename to data/cli/engine/docker_node_ps.yaml diff --git a/data/engine-cli/docker_node_rm.yaml b/data/cli/engine/docker_node_rm.yaml similarity index 100% rename from data/engine-cli/docker_node_rm.yaml rename to data/cli/engine/docker_node_rm.yaml diff --git a/data/engine-cli/docker_node_update.yaml b/data/cli/engine/docker_node_update.yaml similarity index 100% rename from data/engine-cli/docker_node_update.yaml rename to data/cli/engine/docker_node_update.yaml diff --git a/data/engine-cli/docker_pause.yaml b/data/cli/engine/docker_pause.yaml similarity index 100% rename from data/engine-cli/docker_pause.yaml rename to data/cli/engine/docker_pause.yaml diff --git a/data/engine-cli/docker_plugin.yaml b/data/cli/engine/docker_plugin.yaml similarity index 100% rename from data/engine-cli/docker_plugin.yaml rename to data/cli/engine/docker_plugin.yaml diff --git a/data/engine-cli/docker_plugin_create.yaml b/data/cli/engine/docker_plugin_create.yaml similarity index 100% rename from data/engine-cli/docker_plugin_create.yaml rename to data/cli/engine/docker_plugin_create.yaml diff --git a/data/engine-cli/docker_plugin_disable.yaml b/data/cli/engine/docker_plugin_disable.yaml similarity index 100% rename from data/engine-cli/docker_plugin_disable.yaml rename to data/cli/engine/docker_plugin_disable.yaml diff --git a/data/engine-cli/docker_plugin_enable.yaml b/data/cli/engine/docker_plugin_enable.yaml similarity index 100% rename from data/engine-cli/docker_plugin_enable.yaml rename to data/cli/engine/docker_plugin_enable.yaml diff --git a/data/engine-cli/docker_plugin_inspect.yaml b/data/cli/engine/docker_plugin_inspect.yaml similarity index 100% rename from data/engine-cli/docker_plugin_inspect.yaml rename to data/cli/engine/docker_plugin_inspect.yaml diff --git a/data/engine-cli/docker_plugin_install.yaml b/data/cli/engine/docker_plugin_install.yaml similarity index 100% rename from data/engine-cli/docker_plugin_install.yaml rename to data/cli/engine/docker_plugin_install.yaml diff --git a/data/engine-cli/docker_plugin_ls.yaml b/data/cli/engine/docker_plugin_ls.yaml similarity index 100% rename from data/engine-cli/docker_plugin_ls.yaml rename to data/cli/engine/docker_plugin_ls.yaml diff --git a/data/engine-cli/docker_plugin_push.yaml b/data/cli/engine/docker_plugin_push.yaml similarity index 100% rename from data/engine-cli/docker_plugin_push.yaml rename to data/cli/engine/docker_plugin_push.yaml diff --git a/data/engine-cli/docker_plugin_rm.yaml b/data/cli/engine/docker_plugin_rm.yaml similarity index 100% rename from data/engine-cli/docker_plugin_rm.yaml rename to data/cli/engine/docker_plugin_rm.yaml diff --git a/data/engine-cli/docker_plugin_set.yaml b/data/cli/engine/docker_plugin_set.yaml similarity index 100% rename from data/engine-cli/docker_plugin_set.yaml rename to data/cli/engine/docker_plugin_set.yaml diff --git a/data/engine-cli/docker_plugin_upgrade.yaml b/data/cli/engine/docker_plugin_upgrade.yaml similarity index 100% rename from data/engine-cli/docker_plugin_upgrade.yaml rename to data/cli/engine/docker_plugin_upgrade.yaml diff --git a/data/engine-cli/docker_port.yaml b/data/cli/engine/docker_port.yaml similarity index 100% rename from data/engine-cli/docker_port.yaml rename to data/cli/engine/docker_port.yaml diff --git a/data/engine-cli/docker_ps.yaml b/data/cli/engine/docker_ps.yaml similarity index 100% rename from data/engine-cli/docker_ps.yaml rename to data/cli/engine/docker_ps.yaml diff --git a/data/engine-cli/docker_pull.yaml b/data/cli/engine/docker_pull.yaml similarity index 100% rename from data/engine-cli/docker_pull.yaml rename to data/cli/engine/docker_pull.yaml diff --git a/data/engine-cli/docker_push.yaml b/data/cli/engine/docker_push.yaml similarity index 100% rename from data/engine-cli/docker_push.yaml rename to data/cli/engine/docker_push.yaml diff --git a/data/engine-cli/docker_rename.yaml b/data/cli/engine/docker_rename.yaml similarity index 100% rename from data/engine-cli/docker_rename.yaml rename to data/cli/engine/docker_rename.yaml diff --git a/data/engine-cli/docker_restart.yaml b/data/cli/engine/docker_restart.yaml similarity index 100% rename from data/engine-cli/docker_restart.yaml rename to data/cli/engine/docker_restart.yaml diff --git a/data/engine-cli/docker_rm.yaml b/data/cli/engine/docker_rm.yaml similarity index 100% rename from data/engine-cli/docker_rm.yaml rename to data/cli/engine/docker_rm.yaml diff --git a/data/engine-cli/docker_rmi.yaml b/data/cli/engine/docker_rmi.yaml similarity index 100% rename from data/engine-cli/docker_rmi.yaml rename to data/cli/engine/docker_rmi.yaml diff --git a/data/engine-cli/docker_run.yaml b/data/cli/engine/docker_run.yaml similarity index 100% rename from data/engine-cli/docker_run.yaml rename to data/cli/engine/docker_run.yaml diff --git a/data/engine-cli/docker_save.yaml b/data/cli/engine/docker_save.yaml similarity index 100% rename from data/engine-cli/docker_save.yaml rename to data/cli/engine/docker_save.yaml diff --git a/data/engine-cli/docker_search.yaml b/data/cli/engine/docker_search.yaml similarity index 100% rename from data/engine-cli/docker_search.yaml rename to data/cli/engine/docker_search.yaml diff --git a/data/engine-cli/docker_secret.yaml b/data/cli/engine/docker_secret.yaml similarity index 100% rename from data/engine-cli/docker_secret.yaml rename to data/cli/engine/docker_secret.yaml diff --git a/data/engine-cli/docker_secret_create.yaml b/data/cli/engine/docker_secret_create.yaml similarity index 100% rename from data/engine-cli/docker_secret_create.yaml rename to data/cli/engine/docker_secret_create.yaml diff --git a/data/engine-cli/docker_secret_inspect.yaml b/data/cli/engine/docker_secret_inspect.yaml similarity index 100% rename from data/engine-cli/docker_secret_inspect.yaml rename to data/cli/engine/docker_secret_inspect.yaml diff --git a/data/engine-cli/docker_secret_ls.yaml b/data/cli/engine/docker_secret_ls.yaml similarity index 100% rename from data/engine-cli/docker_secret_ls.yaml rename to data/cli/engine/docker_secret_ls.yaml diff --git a/data/engine-cli/docker_secret_rm.yaml b/data/cli/engine/docker_secret_rm.yaml similarity index 100% rename from data/engine-cli/docker_secret_rm.yaml rename to data/cli/engine/docker_secret_rm.yaml diff --git a/data/engine-cli/docker_service.yaml b/data/cli/engine/docker_service.yaml similarity index 100% rename from data/engine-cli/docker_service.yaml rename to data/cli/engine/docker_service.yaml diff --git a/data/engine-cli/docker_service_create.yaml b/data/cli/engine/docker_service_create.yaml similarity index 100% rename from data/engine-cli/docker_service_create.yaml rename to data/cli/engine/docker_service_create.yaml diff --git a/data/engine-cli/docker_service_inspect.yaml b/data/cli/engine/docker_service_inspect.yaml similarity index 100% rename from data/engine-cli/docker_service_inspect.yaml rename to data/cli/engine/docker_service_inspect.yaml diff --git a/data/engine-cli/docker_service_logs.yaml b/data/cli/engine/docker_service_logs.yaml similarity index 100% rename from data/engine-cli/docker_service_logs.yaml rename to data/cli/engine/docker_service_logs.yaml diff --git a/data/engine-cli/docker_service_ls.yaml b/data/cli/engine/docker_service_ls.yaml similarity index 100% rename from data/engine-cli/docker_service_ls.yaml rename to data/cli/engine/docker_service_ls.yaml diff --git a/data/engine-cli/docker_service_ps.yaml b/data/cli/engine/docker_service_ps.yaml similarity index 100% rename from data/engine-cli/docker_service_ps.yaml rename to data/cli/engine/docker_service_ps.yaml diff --git a/data/engine-cli/docker_service_rm.yaml b/data/cli/engine/docker_service_rm.yaml similarity index 100% rename from data/engine-cli/docker_service_rm.yaml rename to data/cli/engine/docker_service_rm.yaml diff --git a/data/engine-cli/docker_service_rollback.yaml b/data/cli/engine/docker_service_rollback.yaml similarity index 100% rename from data/engine-cli/docker_service_rollback.yaml rename to data/cli/engine/docker_service_rollback.yaml diff --git a/data/engine-cli/docker_service_scale.yaml b/data/cli/engine/docker_service_scale.yaml similarity index 100% rename from data/engine-cli/docker_service_scale.yaml rename to data/cli/engine/docker_service_scale.yaml diff --git a/data/engine-cli/docker_service_update.yaml b/data/cli/engine/docker_service_update.yaml similarity index 100% rename from data/engine-cli/docker_service_update.yaml rename to data/cli/engine/docker_service_update.yaml diff --git a/data/engine-cli/docker_stack.yaml b/data/cli/engine/docker_stack.yaml similarity index 100% rename from data/engine-cli/docker_stack.yaml rename to data/cli/engine/docker_stack.yaml diff --git a/data/engine-cli/docker_stack_config.yaml b/data/cli/engine/docker_stack_config.yaml similarity index 100% rename from data/engine-cli/docker_stack_config.yaml rename to data/cli/engine/docker_stack_config.yaml diff --git a/data/engine-cli/docker_stack_deploy.yaml b/data/cli/engine/docker_stack_deploy.yaml similarity index 100% rename from data/engine-cli/docker_stack_deploy.yaml rename to data/cli/engine/docker_stack_deploy.yaml diff --git a/data/engine-cli/docker_stack_ls.yaml b/data/cli/engine/docker_stack_ls.yaml similarity index 100% rename from data/engine-cli/docker_stack_ls.yaml rename to data/cli/engine/docker_stack_ls.yaml diff --git a/data/engine-cli/docker_stack_ps.yaml b/data/cli/engine/docker_stack_ps.yaml similarity index 100% rename from data/engine-cli/docker_stack_ps.yaml rename to data/cli/engine/docker_stack_ps.yaml diff --git a/data/engine-cli/docker_stack_rm.yaml b/data/cli/engine/docker_stack_rm.yaml similarity index 100% rename from data/engine-cli/docker_stack_rm.yaml rename to data/cli/engine/docker_stack_rm.yaml diff --git a/data/engine-cli/docker_stack_services.yaml b/data/cli/engine/docker_stack_services.yaml similarity index 100% rename from data/engine-cli/docker_stack_services.yaml rename to data/cli/engine/docker_stack_services.yaml diff --git a/data/engine-cli/docker_start.yaml b/data/cli/engine/docker_start.yaml similarity index 100% rename from data/engine-cli/docker_start.yaml rename to data/cli/engine/docker_start.yaml diff --git a/data/engine-cli/docker_stats.yaml b/data/cli/engine/docker_stats.yaml similarity index 100% rename from data/engine-cli/docker_stats.yaml rename to data/cli/engine/docker_stats.yaml diff --git a/data/engine-cli/docker_stop.yaml b/data/cli/engine/docker_stop.yaml similarity index 100% rename from data/engine-cli/docker_stop.yaml rename to data/cli/engine/docker_stop.yaml diff --git a/data/engine-cli/docker_swarm.yaml b/data/cli/engine/docker_swarm.yaml similarity index 100% rename from data/engine-cli/docker_swarm.yaml rename to data/cli/engine/docker_swarm.yaml diff --git a/data/engine-cli/docker_swarm_ca.yaml b/data/cli/engine/docker_swarm_ca.yaml similarity index 100% rename from data/engine-cli/docker_swarm_ca.yaml rename to data/cli/engine/docker_swarm_ca.yaml diff --git a/data/engine-cli/docker_swarm_init.yaml b/data/cli/engine/docker_swarm_init.yaml similarity index 100% rename from data/engine-cli/docker_swarm_init.yaml rename to data/cli/engine/docker_swarm_init.yaml diff --git a/data/engine-cli/docker_swarm_join-token.yaml b/data/cli/engine/docker_swarm_join-token.yaml similarity index 100% rename from data/engine-cli/docker_swarm_join-token.yaml rename to data/cli/engine/docker_swarm_join-token.yaml diff --git a/data/engine-cli/docker_swarm_join.yaml b/data/cli/engine/docker_swarm_join.yaml similarity index 100% rename from data/engine-cli/docker_swarm_join.yaml rename to data/cli/engine/docker_swarm_join.yaml diff --git a/data/engine-cli/docker_swarm_leave.yaml b/data/cli/engine/docker_swarm_leave.yaml similarity index 100% rename from data/engine-cli/docker_swarm_leave.yaml rename to data/cli/engine/docker_swarm_leave.yaml diff --git a/data/engine-cli/docker_swarm_unlock-key.yaml b/data/cli/engine/docker_swarm_unlock-key.yaml similarity index 100% rename from data/engine-cli/docker_swarm_unlock-key.yaml rename to data/cli/engine/docker_swarm_unlock-key.yaml diff --git a/data/engine-cli/docker_swarm_unlock.yaml b/data/cli/engine/docker_swarm_unlock.yaml similarity index 100% rename from data/engine-cli/docker_swarm_unlock.yaml rename to data/cli/engine/docker_swarm_unlock.yaml diff --git a/data/engine-cli/docker_swarm_update.yaml b/data/cli/engine/docker_swarm_update.yaml similarity index 100% rename from data/engine-cli/docker_swarm_update.yaml rename to data/cli/engine/docker_swarm_update.yaml diff --git a/data/engine-cli/docker_system.yaml b/data/cli/engine/docker_system.yaml similarity index 100% rename from data/engine-cli/docker_system.yaml rename to data/cli/engine/docker_system.yaml diff --git a/data/engine-cli/docker_system_df.yaml b/data/cli/engine/docker_system_df.yaml similarity index 100% rename from data/engine-cli/docker_system_df.yaml rename to data/cli/engine/docker_system_df.yaml diff --git a/data/engine-cli/docker_system_dial-stdio.yaml b/data/cli/engine/docker_system_dial-stdio.yaml similarity index 100% rename from data/engine-cli/docker_system_dial-stdio.yaml rename to data/cli/engine/docker_system_dial-stdio.yaml diff --git a/data/engine-cli/docker_system_events.yaml b/data/cli/engine/docker_system_events.yaml similarity index 100% rename from data/engine-cli/docker_system_events.yaml rename to data/cli/engine/docker_system_events.yaml diff --git a/data/engine-cli/docker_system_info.yaml b/data/cli/engine/docker_system_info.yaml similarity index 100% rename from data/engine-cli/docker_system_info.yaml rename to data/cli/engine/docker_system_info.yaml diff --git a/data/engine-cli/docker_system_prune.yaml b/data/cli/engine/docker_system_prune.yaml similarity index 100% rename from data/engine-cli/docker_system_prune.yaml rename to data/cli/engine/docker_system_prune.yaml diff --git a/data/engine-cli/docker_tag.yaml b/data/cli/engine/docker_tag.yaml similarity index 100% rename from data/engine-cli/docker_tag.yaml rename to data/cli/engine/docker_tag.yaml diff --git a/data/engine-cli/docker_top.yaml b/data/cli/engine/docker_top.yaml similarity index 100% rename from data/engine-cli/docker_top.yaml rename to data/cli/engine/docker_top.yaml diff --git a/data/engine-cli/docker_trust.yaml b/data/cli/engine/docker_trust.yaml similarity index 100% rename from data/engine-cli/docker_trust.yaml rename to data/cli/engine/docker_trust.yaml diff --git a/data/engine-cli/docker_trust_inspect.yaml b/data/cli/engine/docker_trust_inspect.yaml similarity index 100% rename from data/engine-cli/docker_trust_inspect.yaml rename to data/cli/engine/docker_trust_inspect.yaml diff --git a/data/engine-cli/docker_trust_key.yaml b/data/cli/engine/docker_trust_key.yaml similarity index 100% rename from data/engine-cli/docker_trust_key.yaml rename to data/cli/engine/docker_trust_key.yaml diff --git a/data/engine-cli/docker_trust_key_generate.yaml b/data/cli/engine/docker_trust_key_generate.yaml similarity index 100% rename from data/engine-cli/docker_trust_key_generate.yaml rename to data/cli/engine/docker_trust_key_generate.yaml diff --git a/data/engine-cli/docker_trust_key_load.yaml b/data/cli/engine/docker_trust_key_load.yaml similarity index 100% rename from data/engine-cli/docker_trust_key_load.yaml rename to data/cli/engine/docker_trust_key_load.yaml diff --git a/data/engine-cli/docker_trust_revoke.yaml b/data/cli/engine/docker_trust_revoke.yaml similarity index 100% rename from data/engine-cli/docker_trust_revoke.yaml rename to data/cli/engine/docker_trust_revoke.yaml diff --git a/data/engine-cli/docker_trust_sign.yaml b/data/cli/engine/docker_trust_sign.yaml similarity index 100% rename from data/engine-cli/docker_trust_sign.yaml rename to data/cli/engine/docker_trust_sign.yaml diff --git a/data/engine-cli/docker_trust_signer.yaml b/data/cli/engine/docker_trust_signer.yaml similarity index 100% rename from data/engine-cli/docker_trust_signer.yaml rename to data/cli/engine/docker_trust_signer.yaml diff --git a/data/engine-cli/docker_trust_signer_add.yaml b/data/cli/engine/docker_trust_signer_add.yaml similarity index 100% rename from data/engine-cli/docker_trust_signer_add.yaml rename to data/cli/engine/docker_trust_signer_add.yaml diff --git a/data/engine-cli/docker_trust_signer_remove.yaml b/data/cli/engine/docker_trust_signer_remove.yaml similarity index 100% rename from data/engine-cli/docker_trust_signer_remove.yaml rename to data/cli/engine/docker_trust_signer_remove.yaml diff --git a/data/engine-cli/docker_unpause.yaml b/data/cli/engine/docker_unpause.yaml similarity index 100% rename from data/engine-cli/docker_unpause.yaml rename to data/cli/engine/docker_unpause.yaml diff --git a/data/engine-cli/docker_update.yaml b/data/cli/engine/docker_update.yaml similarity index 100% rename from data/engine-cli/docker_update.yaml rename to data/cli/engine/docker_update.yaml diff --git a/data/engine-cli/docker_version.yaml b/data/cli/engine/docker_version.yaml similarity index 100% rename from data/engine-cli/docker_version.yaml rename to data/cli/engine/docker_version.yaml diff --git a/data/engine-cli/docker_volume.yaml b/data/cli/engine/docker_volume.yaml similarity index 100% rename from data/engine-cli/docker_volume.yaml rename to data/cli/engine/docker_volume.yaml diff --git a/data/engine-cli/docker_volume_create.yaml b/data/cli/engine/docker_volume_create.yaml similarity index 100% rename from data/engine-cli/docker_volume_create.yaml rename to data/cli/engine/docker_volume_create.yaml diff --git a/data/engine-cli/docker_volume_inspect.yaml b/data/cli/engine/docker_volume_inspect.yaml similarity index 100% rename from data/engine-cli/docker_volume_inspect.yaml rename to data/cli/engine/docker_volume_inspect.yaml diff --git a/data/engine-cli/docker_volume_ls.yaml b/data/cli/engine/docker_volume_ls.yaml similarity index 100% rename from data/engine-cli/docker_volume_ls.yaml rename to data/cli/engine/docker_volume_ls.yaml diff --git a/data/engine-cli/docker_volume_prune.yaml b/data/cli/engine/docker_volume_prune.yaml similarity index 100% rename from data/engine-cli/docker_volume_prune.yaml rename to data/cli/engine/docker_volume_prune.yaml diff --git a/data/engine-cli/docker_volume_rm.yaml b/data/cli/engine/docker_volume_rm.yaml similarity index 100% rename from data/engine-cli/docker_volume_rm.yaml rename to data/cli/engine/docker_volume_rm.yaml diff --git a/data/engine-cli/docker_volume_update.yaml b/data/cli/engine/docker_volume_update.yaml similarity index 100% rename from data/engine-cli/docker_volume_update.yaml rename to data/cli/engine/docker_volume_update.yaml diff --git a/data/engine-cli/docker_wait.yaml b/data/cli/engine/docker_wait.yaml similarity index 100% rename from data/engine-cli/docker_wait.yaml rename to data/cli/engine/docker_wait.yaml diff --git a/data/init-cli/docker_init.yaml b/data/cli/init/docker_init.yaml similarity index 100% rename from data/init-cli/docker_init.yaml rename to data/cli/init/docker_init.yaml diff --git a/data/mcp-cli/docker_mcp.yaml b/data/cli/mcp/docker_mcp.yaml similarity index 100% rename from data/mcp-cli/docker_mcp.yaml rename to data/cli/mcp/docker_mcp.yaml diff --git a/data/mcp-cli/docker_mcp_catalog.yaml b/data/cli/mcp/docker_mcp_catalog.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog.yaml rename to data/cli/mcp/docker_mcp_catalog.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_create.yaml b/data/cli/mcp/docker_mcp_catalog_create.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_create.yaml rename to data/cli/mcp/docker_mcp_catalog_create.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_list.yaml b/data/cli/mcp/docker_mcp_catalog_list.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_list.yaml rename to data/cli/mcp/docker_mcp_catalog_list.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_ls.yaml b/data/cli/mcp/docker_mcp_catalog_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_ls.yaml rename to data/cli/mcp/docker_mcp_catalog_ls.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_pull.yaml b/data/cli/mcp/docker_mcp_catalog_pull.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_pull.yaml rename to data/cli/mcp/docker_mcp_catalog_pull.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_push.yaml b/data/cli/mcp/docker_mcp_catalog_push.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_push.yaml rename to data/cli/mcp/docker_mcp_catalog_push.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_remove.yaml b/data/cli/mcp/docker_mcp_catalog_remove.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_remove.yaml rename to data/cli/mcp/docker_mcp_catalog_remove.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_rm.yaml b/data/cli/mcp/docker_mcp_catalog_rm.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_rm.yaml rename to data/cli/mcp/docker_mcp_catalog_rm.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_server.yaml b/data/cli/mcp/docker_mcp_catalog_server.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_server.yaml rename to data/cli/mcp/docker_mcp_catalog_server.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_server_add.yaml b/data/cli/mcp/docker_mcp_catalog_server_add.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_server_add.yaml rename to data/cli/mcp/docker_mcp_catalog_server_add.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_server_inspect.yaml b/data/cli/mcp/docker_mcp_catalog_server_inspect.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_server_inspect.yaml rename to data/cli/mcp/docker_mcp_catalog_server_inspect.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_server_ls.yaml b/data/cli/mcp/docker_mcp_catalog_server_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_server_ls.yaml rename to data/cli/mcp/docker_mcp_catalog_server_ls.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_server_remove.yaml b/data/cli/mcp/docker_mcp_catalog_server_remove.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_server_remove.yaml rename to data/cli/mcp/docker_mcp_catalog_server_remove.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_show.yaml b/data/cli/mcp/docker_mcp_catalog_show.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_show.yaml rename to data/cli/mcp/docker_mcp_catalog_show.yaml diff --git a/data/mcp-cli/docker_mcp_catalog_tag.yaml b/data/cli/mcp/docker_mcp_catalog_tag.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_catalog_tag.yaml rename to data/cli/mcp/docker_mcp_catalog_tag.yaml diff --git a/data/mcp-cli/docker_mcp_client.yaml b/data/cli/mcp/docker_mcp_client.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_client.yaml rename to data/cli/mcp/docker_mcp_client.yaml diff --git a/data/mcp-cli/docker_mcp_client_connect.yaml b/data/cli/mcp/docker_mcp_client_connect.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_client_connect.yaml rename to data/cli/mcp/docker_mcp_client_connect.yaml diff --git a/data/mcp-cli/docker_mcp_client_disconnect.yaml b/data/cli/mcp/docker_mcp_client_disconnect.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_client_disconnect.yaml rename to data/cli/mcp/docker_mcp_client_disconnect.yaml diff --git a/data/mcp-cli/docker_mcp_client_ls.yaml b/data/cli/mcp/docker_mcp_client_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_client_ls.yaml rename to data/cli/mcp/docker_mcp_client_ls.yaml diff --git a/data/mcp-cli/docker_mcp_feature.yaml b/data/cli/mcp/docker_mcp_feature.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_feature.yaml rename to data/cli/mcp/docker_mcp_feature.yaml diff --git a/data/mcp-cli/docker_mcp_feature_disable.yaml b/data/cli/mcp/docker_mcp_feature_disable.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_feature_disable.yaml rename to data/cli/mcp/docker_mcp_feature_disable.yaml diff --git a/data/mcp-cli/docker_mcp_feature_enable.yaml b/data/cli/mcp/docker_mcp_feature_enable.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_feature_enable.yaml rename to data/cli/mcp/docker_mcp_feature_enable.yaml diff --git a/data/mcp-cli/docker_mcp_feature_list.yaml b/data/cli/mcp/docker_mcp_feature_list.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_feature_list.yaml rename to data/cli/mcp/docker_mcp_feature_list.yaml diff --git a/data/mcp-cli/docker_mcp_feature_ls.yaml b/data/cli/mcp/docker_mcp_feature_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_feature_ls.yaml rename to data/cli/mcp/docker_mcp_feature_ls.yaml diff --git a/data/mcp-cli/docker_mcp_gateway.yaml b/data/cli/mcp/docker_mcp_gateway.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_gateway.yaml rename to data/cli/mcp/docker_mcp_gateway.yaml diff --git a/data/mcp-cli/docker_mcp_gateway_run.yaml b/data/cli/mcp/docker_mcp_gateway_run.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_gateway_run.yaml rename to data/cli/mcp/docker_mcp_gateway_run.yaml diff --git a/data/mcp-cli/docker_mcp_profile.yaml b/data/cli/mcp/docker_mcp_profile.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile.yaml rename to data/cli/mcp/docker_mcp_profile.yaml diff --git a/data/mcp-cli/docker_mcp_profile_config.yaml b/data/cli/mcp/docker_mcp_profile_config.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_config.yaml rename to data/cli/mcp/docker_mcp_profile_config.yaml diff --git a/data/mcp-cli/docker_mcp_profile_create.yaml b/data/cli/mcp/docker_mcp_profile_create.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_create.yaml rename to data/cli/mcp/docker_mcp_profile_create.yaml diff --git a/data/mcp-cli/docker_mcp_profile_export.yaml b/data/cli/mcp/docker_mcp_profile_export.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_export.yaml rename to data/cli/mcp/docker_mcp_profile_export.yaml diff --git a/data/mcp-cli/docker_mcp_profile_import.yaml b/data/cli/mcp/docker_mcp_profile_import.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_import.yaml rename to data/cli/mcp/docker_mcp_profile_import.yaml diff --git a/data/mcp-cli/docker_mcp_profile_list.yaml b/data/cli/mcp/docker_mcp_profile_list.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_list.yaml rename to data/cli/mcp/docker_mcp_profile_list.yaml diff --git a/data/mcp-cli/docker_mcp_profile_pull.yaml b/data/cli/mcp/docker_mcp_profile_pull.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_pull.yaml rename to data/cli/mcp/docker_mcp_profile_pull.yaml diff --git a/data/mcp-cli/docker_mcp_profile_push.yaml b/data/cli/mcp/docker_mcp_profile_push.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_push.yaml rename to data/cli/mcp/docker_mcp_profile_push.yaml diff --git a/data/mcp-cli/docker_mcp_profile_remove.yaml b/data/cli/mcp/docker_mcp_profile_remove.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_remove.yaml rename to data/cli/mcp/docker_mcp_profile_remove.yaml diff --git a/data/mcp-cli/docker_mcp_profile_server.yaml b/data/cli/mcp/docker_mcp_profile_server.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_server.yaml rename to data/cli/mcp/docker_mcp_profile_server.yaml diff --git a/data/mcp-cli/docker_mcp_profile_server_add.yaml b/data/cli/mcp/docker_mcp_profile_server_add.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_server_add.yaml rename to data/cli/mcp/docker_mcp_profile_server_add.yaml diff --git a/data/mcp-cli/docker_mcp_profile_server_ls.yaml b/data/cli/mcp/docker_mcp_profile_server_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_server_ls.yaml rename to data/cli/mcp/docker_mcp_profile_server_ls.yaml diff --git a/data/mcp-cli/docker_mcp_profile_server_remove.yaml b/data/cli/mcp/docker_mcp_profile_server_remove.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_server_remove.yaml rename to data/cli/mcp/docker_mcp_profile_server_remove.yaml diff --git a/data/mcp-cli/docker_mcp_profile_show.yaml b/data/cli/mcp/docker_mcp_profile_show.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_show.yaml rename to data/cli/mcp/docker_mcp_profile_show.yaml diff --git a/data/mcp-cli/docker_mcp_profile_tools.yaml b/data/cli/mcp/docker_mcp_profile_tools.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_profile_tools.yaml rename to data/cli/mcp/docker_mcp_profile_tools.yaml diff --git a/data/mcp-cli/docker_mcp_secret.yaml b/data/cli/mcp/docker_mcp_secret.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_secret.yaml rename to data/cli/mcp/docker_mcp_secret.yaml diff --git a/data/mcp-cli/docker_mcp_secret_ls.yaml b/data/cli/mcp/docker_mcp_secret_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_secret_ls.yaml rename to data/cli/mcp/docker_mcp_secret_ls.yaml diff --git a/data/mcp-cli/docker_mcp_secret_rm.yaml b/data/cli/mcp/docker_mcp_secret_rm.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_secret_rm.yaml rename to data/cli/mcp/docker_mcp_secret_rm.yaml diff --git a/data/mcp-cli/docker_mcp_secret_set.yaml b/data/cli/mcp/docker_mcp_secret_set.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_secret_set.yaml rename to data/cli/mcp/docker_mcp_secret_set.yaml diff --git a/data/mcp-cli/docker_mcp_server.yaml b/data/cli/mcp/docker_mcp_server.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_server.yaml rename to data/cli/mcp/docker_mcp_server.yaml diff --git a/data/mcp-cli/docker_mcp_server_init.yaml b/data/cli/mcp/docker_mcp_server_init.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_server_init.yaml rename to data/cli/mcp/docker_mcp_server_init.yaml diff --git a/data/mcp-cli/docker_mcp_tools.yaml b/data/cli/mcp/docker_mcp_tools.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools.yaml rename to data/cli/mcp/docker_mcp_tools.yaml diff --git a/data/mcp-cli/docker_mcp_tools_call.yaml b/data/cli/mcp/docker_mcp_tools_call.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools_call.yaml rename to data/cli/mcp/docker_mcp_tools_call.yaml diff --git a/data/mcp-cli/docker_mcp_tools_count.yaml b/data/cli/mcp/docker_mcp_tools_count.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools_count.yaml rename to data/cli/mcp/docker_mcp_tools_count.yaml diff --git a/data/mcp-cli/docker_mcp_tools_inspect.yaml b/data/cli/mcp/docker_mcp_tools_inspect.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools_inspect.yaml rename to data/cli/mcp/docker_mcp_tools_inspect.yaml diff --git a/data/mcp-cli/docker_mcp_tools_list.yaml b/data/cli/mcp/docker_mcp_tools_list.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools_list.yaml rename to data/cli/mcp/docker_mcp_tools_list.yaml diff --git a/data/mcp-cli/docker_mcp_tools_ls.yaml b/data/cli/mcp/docker_mcp_tools_ls.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_tools_ls.yaml rename to data/cli/mcp/docker_mcp_tools_ls.yaml diff --git a/data/mcp-cli/docker_mcp_version.yaml b/data/cli/mcp/docker_mcp_version.yaml similarity index 100% rename from data/mcp-cli/docker_mcp_version.yaml rename to data/cli/mcp/docker_mcp_version.yaml diff --git a/data/offload-cli/docker_offload.yaml b/data/cli/offload/docker_offload.yaml similarity index 100% rename from data/offload-cli/docker_offload.yaml rename to data/cli/offload/docker_offload.yaml diff --git a/data/offload-cli/docker_offload_diagnose.yaml b/data/cli/offload/docker_offload_diagnose.yaml similarity index 100% rename from data/offload-cli/docker_offload_diagnose.yaml rename to data/cli/offload/docker_offload_diagnose.yaml diff --git a/data/offload-cli/docker_offload_start.yaml b/data/cli/offload/docker_offload_start.yaml similarity index 100% rename from data/offload-cli/docker_offload_start.yaml rename to data/cli/offload/docker_offload_start.yaml diff --git a/data/offload-cli/docker_offload_status.yaml b/data/cli/offload/docker_offload_status.yaml similarity index 100% rename from data/offload-cli/docker_offload_status.yaml rename to data/cli/offload/docker_offload_status.yaml diff --git a/data/offload-cli/docker_offload_stop.yaml b/data/cli/offload/docker_offload_stop.yaml similarity index 100% rename from data/offload-cli/docker_offload_stop.yaml rename to data/cli/offload/docker_offload_stop.yaml diff --git a/data/offload-cli/docker_offload_version.yaml b/data/cli/offload/docker_offload_version.yaml similarity index 100% rename from data/offload-cli/docker_offload_version.yaml rename to data/cli/offload/docker_offload_version.yaml diff --git a/data/sandbox-cli/docker_sandbox.yaml b/data/cli/sandbox/docker_sandbox.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox.yaml rename to data/cli/sandbox/docker_sandbox.yaml diff --git a/data/sandbox-cli/docker_sandbox_create.yaml b/data/cli/sandbox/docker_sandbox_create.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create.yaml rename to data/cli/sandbox/docker_sandbox_create.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_cagent.yaml b/data/cli/sandbox/docker_sandbox_create_cagent.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_cagent.yaml rename to data/cli/sandbox/docker_sandbox_create_cagent.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_claude.yaml b/data/cli/sandbox/docker_sandbox_create_claude.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_claude.yaml rename to data/cli/sandbox/docker_sandbox_create_claude.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_codex.yaml b/data/cli/sandbox/docker_sandbox_create_codex.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_codex.yaml rename to data/cli/sandbox/docker_sandbox_create_codex.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_copilot.yaml b/data/cli/sandbox/docker_sandbox_create_copilot.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_copilot.yaml rename to data/cli/sandbox/docker_sandbox_create_copilot.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_gemini.yaml b/data/cli/sandbox/docker_sandbox_create_gemini.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_gemini.yaml rename to data/cli/sandbox/docker_sandbox_create_gemini.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_kiro.yaml b/data/cli/sandbox/docker_sandbox_create_kiro.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_kiro.yaml rename to data/cli/sandbox/docker_sandbox_create_kiro.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_opencode.yaml b/data/cli/sandbox/docker_sandbox_create_opencode.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_opencode.yaml rename to data/cli/sandbox/docker_sandbox_create_opencode.yaml diff --git a/data/sandbox-cli/docker_sandbox_create_shell.yaml b/data/cli/sandbox/docker_sandbox_create_shell.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_create_shell.yaml rename to data/cli/sandbox/docker_sandbox_create_shell.yaml diff --git a/data/sandbox-cli/docker_sandbox_exec.yaml b/data/cli/sandbox/docker_sandbox_exec.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_exec.yaml rename to data/cli/sandbox/docker_sandbox_exec.yaml diff --git a/data/sandbox-cli/docker_sandbox_inspect.yaml b/data/cli/sandbox/docker_sandbox_inspect.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_inspect.yaml rename to data/cli/sandbox/docker_sandbox_inspect.yaml diff --git a/data/sandbox-cli/docker_sandbox_ls.yaml b/data/cli/sandbox/docker_sandbox_ls.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_ls.yaml rename to data/cli/sandbox/docker_sandbox_ls.yaml diff --git a/data/sandbox-cli/docker_sandbox_network.yaml b/data/cli/sandbox/docker_sandbox_network.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_network.yaml rename to data/cli/sandbox/docker_sandbox_network.yaml diff --git a/data/sandbox-cli/docker_sandbox_network_log.yaml b/data/cli/sandbox/docker_sandbox_network_log.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_network_log.yaml rename to data/cli/sandbox/docker_sandbox_network_log.yaml diff --git a/data/sandbox-cli/docker_sandbox_network_proxy.yaml b/data/cli/sandbox/docker_sandbox_network_proxy.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_network_proxy.yaml rename to data/cli/sandbox/docker_sandbox_network_proxy.yaml diff --git a/data/sandbox-cli/docker_sandbox_reset.yaml b/data/cli/sandbox/docker_sandbox_reset.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_reset.yaml rename to data/cli/sandbox/docker_sandbox_reset.yaml diff --git a/data/sandbox-cli/docker_sandbox_rm.yaml b/data/cli/sandbox/docker_sandbox_rm.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_rm.yaml rename to data/cli/sandbox/docker_sandbox_rm.yaml diff --git a/data/sandbox-cli/docker_sandbox_run.yaml b/data/cli/sandbox/docker_sandbox_run.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_run.yaml rename to data/cli/sandbox/docker_sandbox_run.yaml diff --git a/data/sandbox-cli/docker_sandbox_save.yaml b/data/cli/sandbox/docker_sandbox_save.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_save.yaml rename to data/cli/sandbox/docker_sandbox_save.yaml diff --git a/data/sandbox-cli/docker_sandbox_stop.yaml b/data/cli/sandbox/docker_sandbox_stop.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_stop.yaml rename to data/cli/sandbox/docker_sandbox_stop.yaml diff --git a/data/sandbox-cli/docker_sandbox_version.yaml b/data/cli/sandbox/docker_sandbox_version.yaml similarity index 100% rename from data/sandbox-cli/docker_sandbox_version.yaml rename to data/cli/sandbox/docker_sandbox_version.yaml diff --git a/data/scout-cli/docker_scout.yaml b/data/cli/scout/docker_scout.yaml similarity index 100% rename from data/scout-cli/docker_scout.yaml rename to data/cli/scout/docker_scout.yaml diff --git a/data/scout-cli/docker_scout_attestation.yaml b/data/cli/scout/docker_scout_attestation.yaml similarity index 100% rename from data/scout-cli/docker_scout_attestation.yaml rename to data/cli/scout/docker_scout_attestation.yaml diff --git a/data/scout-cli/docker_scout_attestation_add.yaml b/data/cli/scout/docker_scout_attestation_add.yaml similarity index 100% rename from data/scout-cli/docker_scout_attestation_add.yaml rename to data/cli/scout/docker_scout_attestation_add.yaml diff --git a/data/scout-cli/docker_scout_attestation_get.yaml b/data/cli/scout/docker_scout_attestation_get.yaml similarity index 100% rename from data/scout-cli/docker_scout_attestation_get.yaml rename to data/cli/scout/docker_scout_attestation_get.yaml diff --git a/data/scout-cli/docker_scout_attestation_list.yaml b/data/cli/scout/docker_scout_attestation_list.yaml similarity index 100% rename from data/scout-cli/docker_scout_attestation_list.yaml rename to data/cli/scout/docker_scout_attestation_list.yaml diff --git a/data/scout-cli/docker_scout_cache.yaml b/data/cli/scout/docker_scout_cache.yaml similarity index 100% rename from data/scout-cli/docker_scout_cache.yaml rename to data/cli/scout/docker_scout_cache.yaml diff --git a/data/scout-cli/docker_scout_cache_df.yaml b/data/cli/scout/docker_scout_cache_df.yaml similarity index 100% rename from data/scout-cli/docker_scout_cache_df.yaml rename to data/cli/scout/docker_scout_cache_df.yaml diff --git a/data/scout-cli/docker_scout_cache_prune.yaml b/data/cli/scout/docker_scout_cache_prune.yaml similarity index 100% rename from data/scout-cli/docker_scout_cache_prune.yaml rename to data/cli/scout/docker_scout_cache_prune.yaml diff --git a/data/scout-cli/docker_scout_compare.yaml b/data/cli/scout/docker_scout_compare.yaml similarity index 100% rename from data/scout-cli/docker_scout_compare.yaml rename to data/cli/scout/docker_scout_compare.yaml diff --git a/data/scout-cli/docker_scout_config.yaml b/data/cli/scout/docker_scout_config.yaml similarity index 100% rename from data/scout-cli/docker_scout_config.yaml rename to data/cli/scout/docker_scout_config.yaml diff --git a/data/scout-cli/docker_scout_cves.yaml b/data/cli/scout/docker_scout_cves.yaml similarity index 100% rename from data/scout-cli/docker_scout_cves.yaml rename to data/cli/scout/docker_scout_cves.yaml diff --git a/data/scout-cli/docker_scout_docker-cli-plugin-hooks.yaml b/data/cli/scout/docker_scout_docker-cli-plugin-hooks.yaml similarity index 100% rename from data/scout-cli/docker_scout_docker-cli-plugin-hooks.yaml rename to data/cli/scout/docker_scout_docker-cli-plugin-hooks.yaml diff --git a/data/scout-cli/docker_scout_enroll.yaml b/data/cli/scout/docker_scout_enroll.yaml similarity index 100% rename from data/scout-cli/docker_scout_enroll.yaml rename to data/cli/scout/docker_scout_enroll.yaml diff --git a/data/scout-cli/docker_scout_environment.yaml b/data/cli/scout/docker_scout_environment.yaml similarity index 100% rename from data/scout-cli/docker_scout_environment.yaml rename to data/cli/scout/docker_scout_environment.yaml diff --git a/data/scout-cli/docker_scout_help.yaml b/data/cli/scout/docker_scout_help.yaml similarity index 100% rename from data/scout-cli/docker_scout_help.yaml rename to data/cli/scout/docker_scout_help.yaml diff --git a/data/scout-cli/docker_scout_integration.yaml b/data/cli/scout/docker_scout_integration.yaml similarity index 100% rename from data/scout-cli/docker_scout_integration.yaml rename to data/cli/scout/docker_scout_integration.yaml diff --git a/data/scout-cli/docker_scout_integration_configure.yaml b/data/cli/scout/docker_scout_integration_configure.yaml similarity index 100% rename from data/scout-cli/docker_scout_integration_configure.yaml rename to data/cli/scout/docker_scout_integration_configure.yaml diff --git a/data/scout-cli/docker_scout_integration_delete.yaml b/data/cli/scout/docker_scout_integration_delete.yaml similarity index 100% rename from data/scout-cli/docker_scout_integration_delete.yaml rename to data/cli/scout/docker_scout_integration_delete.yaml diff --git a/data/scout-cli/docker_scout_integration_list.yaml b/data/cli/scout/docker_scout_integration_list.yaml similarity index 100% rename from data/scout-cli/docker_scout_integration_list.yaml rename to data/cli/scout/docker_scout_integration_list.yaml diff --git a/data/scout-cli/docker_scout_policy.yaml b/data/cli/scout/docker_scout_policy.yaml similarity index 100% rename from data/scout-cli/docker_scout_policy.yaml rename to data/cli/scout/docker_scout_policy.yaml diff --git a/data/scout-cli/docker_scout_push.yaml b/data/cli/scout/docker_scout_push.yaml similarity index 100% rename from data/scout-cli/docker_scout_push.yaml rename to data/cli/scout/docker_scout_push.yaml diff --git a/data/scout-cli/docker_scout_quickview.yaml b/data/cli/scout/docker_scout_quickview.yaml similarity index 100% rename from data/scout-cli/docker_scout_quickview.yaml rename to data/cli/scout/docker_scout_quickview.yaml diff --git a/data/scout-cli/docker_scout_recommendations.yaml b/data/cli/scout/docker_scout_recommendations.yaml similarity index 100% rename from data/scout-cli/docker_scout_recommendations.yaml rename to data/cli/scout/docker_scout_recommendations.yaml diff --git a/data/scout-cli/docker_scout_repo.yaml b/data/cli/scout/docker_scout_repo.yaml similarity index 100% rename from data/scout-cli/docker_scout_repo.yaml rename to data/cli/scout/docker_scout_repo.yaml diff --git a/data/scout-cli/docker_scout_repo_disable.yaml b/data/cli/scout/docker_scout_repo_disable.yaml similarity index 100% rename from data/scout-cli/docker_scout_repo_disable.yaml rename to data/cli/scout/docker_scout_repo_disable.yaml diff --git a/data/scout-cli/docker_scout_repo_enable.yaml b/data/cli/scout/docker_scout_repo_enable.yaml similarity index 100% rename from data/scout-cli/docker_scout_repo_enable.yaml rename to data/cli/scout/docker_scout_repo_enable.yaml diff --git a/data/scout-cli/docker_scout_repo_list.yaml b/data/cli/scout/docker_scout_repo_list.yaml similarity index 100% rename from data/scout-cli/docker_scout_repo_list.yaml rename to data/cli/scout/docker_scout_repo_list.yaml diff --git a/data/scout-cli/docker_scout_sbom.yaml b/data/cli/scout/docker_scout_sbom.yaml similarity index 100% rename from data/scout-cli/docker_scout_sbom.yaml rename to data/cli/scout/docker_scout_sbom.yaml diff --git a/data/scout-cli/docker_scout_stream.yaml b/data/cli/scout/docker_scout_stream.yaml similarity index 100% rename from data/scout-cli/docker_scout_stream.yaml rename to data/cli/scout/docker_scout_stream.yaml diff --git a/data/scout-cli/docker_scout_version.yaml b/data/cli/scout/docker_scout_version.yaml similarity index 100% rename from data/scout-cli/docker_scout_version.yaml rename to data/cli/scout/docker_scout_version.yaml diff --git a/data/scout-cli/docker_scout_vex.yaml b/data/cli/scout/docker_scout_vex.yaml similarity index 100% rename from data/scout-cli/docker_scout_vex.yaml rename to data/cli/scout/docker_scout_vex.yaml diff --git a/data/scout-cli/docker_scout_vex_get.yaml b/data/cli/scout/docker_scout_vex_get.yaml similarity index 100% rename from data/scout-cli/docker_scout_vex_get.yaml rename to data/cli/scout/docker_scout_vex_get.yaml diff --git a/data/scout-cli/docker_scout_watch.yaml b/data/cli/scout/docker_scout_watch.yaml similarity index 100% rename from data/scout-cli/docker_scout_watch.yaml rename to data/cli/scout/docker_scout_watch.yaml diff --git a/data/secrets-engine/docker_pass.yaml b/data/cli/secrets/docker_pass.yaml similarity index 100% rename from data/secrets-engine/docker_pass.yaml rename to data/cli/secrets/docker_pass.yaml diff --git a/data/secrets-engine/docker_pass_get.yaml b/data/cli/secrets/docker_pass_get.yaml similarity index 100% rename from data/secrets-engine/docker_pass_get.yaml rename to data/cli/secrets/docker_pass_get.yaml diff --git a/data/secrets-engine/docker_pass_ls.yaml b/data/cli/secrets/docker_pass_ls.yaml similarity index 100% rename from data/secrets-engine/docker_pass_ls.yaml rename to data/cli/secrets/docker_pass_ls.yaml diff --git a/data/secrets-engine/docker_pass_rm.yaml b/data/cli/secrets/docker_pass_rm.yaml similarity index 100% rename from data/secrets-engine/docker_pass_rm.yaml rename to data/cli/secrets/docker_pass_rm.yaml diff --git a/data/secrets-engine/docker_pass_set.yaml b/data/cli/secrets/docker_pass_set.yaml similarity index 100% rename from data/secrets-engine/docker_pass_set.yaml rename to data/cli/secrets/docker_pass_set.yaml diff --git a/hack/sync-cli-docs.sh b/hack/sync-cli-docs.sh index 0747dd5109..687ed72366 100755 --- a/hack/sync-cli-docs.sh +++ b/hack/sync-cli-docs.sh @@ -15,19 +15,19 @@ main() { trap "GIT_DIR=\"$cli_source\" git worktree remove \"$worktree_dir\" --force 2>/dev/null || true" EXIT (set -e; cd "$worktree_dir"; make -f docker.Makefile yamldocs || { printf "::error::Failed to generate YAML docs!\n"; exit 1; }) || return $? - cp "$worktree_dir"/docs/yaml/*.yaml ./data/engine-cli/ + cp "$worktree_dir"/docs/yaml/*.yaml ./data/cli/engine/ - if git diff --quiet "./data/engine-cli/*.yaml"; then + if git diff --quiet "./data/cli/engine/*.yaml"; then printf "\e[32m✅ Already up to date\e[0m\n" return 100 fi echo -e "ℹ️ Changes detected:" - git diff --stat "./data/engine-cli/*.yaml" || true + git diff --stat "./data/cli/engine/*.yaml" || true NICE_GIT_REF=$(cd "$worktree_dir" && git describe --always --dirty) || return $? - git add "./data/engine-cli/*.yaml" + git add "./data/cli/engine/*.yaml" git commit -m "cli: sync docs with docker/cli $NICE_GIT_REF" diff --git a/hugo.yaml b/hugo.yaml index c14fe76097..209a784a86 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -357,12 +357,12 @@ module: - path: github.com/docker/compose/v5 mounts: - source: docs/reference - target: data/compose-cli + target: data/cli/compose files: ["*.yaml"] # Model CLI - path: github.com/docker/model-runner/cmd/cli mounts: - source: docs/reference - target: data/model-cli + target: data/cli/model files: ["*.yaml"] diff --git a/layouts/cli.html b/layouts/cli.html index 74f267f7f4..544cfbef36 100644 --- a/layouts/cli.html +++ b/layouts/cli.html @@ -1,5 +1,5 @@ {{ define "article" }} - {{ $data := index (index site.Data .Params.datafolder) .Params.datafile }} + {{ $data := index site.Data.cli .Params.datafolder .Params.datafile }} {{ .Store.Set "headings" slice }} {{ .Store.Set "subheadings" slice }} @@ -185,7 +185,7 @@ can be removed entirely in a future release. {{- if and .Params.datafolder .Params.datafile }} {{ .Title }} - {{ $data := index (index site.Data .Params.datafolder) .Params.datafile }} + {{ $data := index site.Data.cli .Params.datafolder .Params.datafile }} {{ $data.short }} {{- end }} diff --git a/layouts/cli.markdown.md b/layouts/cli.markdown.md index 98def80621..e276a4ec8b 100644 --- a/layouts/cli.markdown.md +++ b/layouts/cli.markdown.md @@ -1,4 +1,4 @@ -{{- $data := index (index site.Data .Params.datafolder) .Params.datafile -}} +{{- $data := index site.Data.cli .Params.datafolder .Params.datafile -}} # {{ .Title }} {{ with $data.short }}**Description:** {{ . }}{{ end }} @@ -44,6 +44,6 @@ | Command | Description | |---------|-------------| -{{ range .Pages }}{{ if and .Params.datafolder .Params.datafile }}{{ $subdata := index (index site.Data .Params.datafolder) .Params.datafile }}| [`{{ .Title }}`]({{ .Permalink }}) | {{ $subdata.short }} | +{{ range .Pages }}{{ if and .Params.datafolder .Params.datafile }}{{ $subdata := index site.Data.cli .Params.datafolder .Params.datafile }}| [`{{ .Title }}`]({{ .Permalink }}) | {{ $subdata.short }} | {{ end }}{{ end }} {{ end }}