From b404cfc3651e30d3404ab9ab1704a5827c0151b4 Mon Sep 17 00:00:00 2001 From: Matthew Aynalem Date: Sun, 3 Feb 2019 16:17:53 -0800 Subject: [PATCH] add builder/tencentcloud-cvm to sidebar post-processors/docker-import - move tags under optional add missing data types to various attributes --- .../docs/builders/hyperv-iso.html.md.erb | 2 +- .../docs/builders/hyperv-vmcx.html.md.erb | 4 ++-- .../docs/builders/tencentcloud-cvm.html.md | 22 +++++++++---------- .../post-processors/docker-import.html.md | 4 ++-- website/source/layouts/docs.erb | 3 +++ 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/website/source/docs/builders/hyperv-iso.html.md.erb b/website/source/docs/builders/hyperv-iso.html.md.erb index 6d989713a..0c2e6aa9f 100644 --- a/website/source/docs/builders/hyperv-iso.html.md.erb +++ b/website/source/docs/builders/hyperv-iso.html.md.erb @@ -94,7 +94,7 @@ builder. Packer to wait for 1 minute 30 seconds before typing the boot command. The default duration is "10s" (10 seconds). -- `configuration_version` - This allows you to set the vm version when +- `configuration_version` (string) - This allows you to set the vm version when calling New-VM to generate the vm. - `cpu` (number) - The number of CPUs the virtual machine should use. If diff --git a/website/source/docs/builders/hyperv-vmcx.html.md.erb b/website/source/docs/builders/hyperv-vmcx.html.md.erb index de5cdd176..af549bb94 100644 --- a/website/source/docs/builders/hyperv-vmcx.html.md.erb +++ b/website/source/docs/builders/hyperv-vmcx.html.md.erb @@ -116,7 +116,7 @@ builder. This setting only has an effect if using `clone_from_vm_name` and is ignored otherwise. -- `copy_in_compare` - (bool) When cloning a vm to build from, we run a powershell +- `copy_in_compare` (boolean) - When cloning a vm to build from, we run a powershell Compare-VM command, which, depending on your version of Windows, may need the "Copy" flag to be set to true or false. Defaults to "false". Command: @@ -125,7 +125,7 @@ builder. Where $copy is replaced with either true or false depending on the value of "copy_in_compare". -- `configuration_version` - This allows you to set the vm version when +- `configuration_version` (string) - This allows you to set the vm version when calling New-VM to generate the vm. - `cpu` (number) - The number of CPUs the virtual machine should use. If diff --git a/website/source/docs/builders/tencentcloud-cvm.html.md b/website/source/docs/builders/tencentcloud-cvm.html.md index 45ae31ce3..544dee29e 100644 --- a/website/source/docs/builders/tencentcloud-cvm.html.md +++ b/website/source/docs/builders/tencentcloud-cvm.html.md @@ -3,8 +3,8 @@ description: | The `tencentcloud-cvm` Packer builder plugin provide the capability to build customized images based on an existing base images. layout: docs -page_title: Tencentcloud Image Builder -sidebar_current: 'docs-builders-tencentcloud-ecs' +page_title: 'Tencentcloud Image Builder' +sidebar_current: 'docs-builders-tencentcloud-cvm' --- # Tencentcloud Image Builder @@ -88,16 +88,16 @@ builder. - LOCAL_BASIC: 50 - Other: 50 ~ 1000 (need whitelist if > 50) -- `vpc_id` - Specify vpc your cvm will be launched by. +- `vpc_id` (string) - Specify vpc your cvm will be launched by. -- `vpc_name` - Specify vpc name you will create. if `vpc_id` is not set, packer will +- `vpc_name` (string) - Specify vpc name you will create. if `vpc_id` is not set, packer will create a vpc for you named this parameter. - `cidr_block` (boolean) - Specify cider block of the vpc you will create if `vpc_id` not set -- `subnet_id` - Specify subnet your cvm will be launched by. +- `subnet_id` (string) - Specify subnet your cvm will be launched by. -- 'subnet_name' - Specify subnet name you will create. if `subnet_id` is not set, packer will +- `subnet_name` (string) - Specify subnet name you will create. if `subnet_id` is not set, packer will create a subnet for you named this parameter. - `subnect_cidr_block` (boolean) - Specify cider block of the subnet you will create if @@ -106,15 +106,15 @@ builder. - `internet_max_bandwidth_out` (number) - Max bandwidth out your cvm will be launched by(in MB). values can be set between 1 ~ 100. -- `security_group_id` - Specify security group your cvm will be launched by. +- `security_group_id` (string) - Specify security group your cvm will be launched by. -- `security_group_name` - Specify security name you will create if `security_group_id` not set. +- `security_group_name` (string) - Specify security name you will create if `security_group_id` not set. -- `user_data` - userdata. +- `user_data` (string) - userdata. -- `user_data_file` - userdata file. +- `user_data_file` (string) - userdata file. -- `host_name` - host name. +- `host_name` (string) - host name. ## Basic Example diff --git a/website/source/docs/post-processors/docker-import.html.md b/website/source/docs/post-processors/docker-import.html.md index 1d3e413d7..8802a18e7 100644 --- a/website/source/docs/post-processors/docker-import.html.md +++ b/website/source/docs/post-processors/docker-import.html.md @@ -29,11 +29,11 @@ is optional. - `repository` (string) - The repository of the imported image. +### Optional: + - `tag` (string) - The tag for the imported image. By default this is not set. -### Optional: - - `changes` (array of strings) - Dockerfile instructions to add to the commit. Example of instructions are `CMD`, `ENTRYPOINT`, `ENV`, and `EXPOSE`. Example: `[ "USER ubuntu", "WORKDIR /app", "EXPOSE 8080" ]` diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 5a9f4436d..e0cf12c86 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -162,6 +162,9 @@ > Scaleway + > + Tencent Cloud + > Triton