Merge pull request #7268 from mayn/docs-updates-v144

docs - minor fixes
This commit is contained in:
Adrien Delorme 2019-02-04 10:45:20 +01:00 committed by GitHub
commit 9f1ec211a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 16 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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" ]`

View File

@ -162,6 +162,9 @@
<li<%= sidebar_current("docs-builders-scaleway") %>>
<a href="/docs/builders/scaleway.html">Scaleway</a>
</li>
<li<%= sidebar_current("docs-builders-tencentcloud-cvm") %>>
<a href="/docs/builders/tencentcloud-cvm.html">Tencent Cloud</a>
</li>
<li<%= sidebar_current("docs-builders-triton") %>>
<a href="/docs/builders/triton.html">Triton</a>
</li>