iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_7157

This commit is contained in:
Adrien Delorme 2019-01-04 14:32:31 +01:00 committed by GitHub
parent 6ff61b3cdf 0621a3dd99
commit ce8dd67501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/builders/amazon-chroot.html.md
View File

@ -458,7 +458,7 @@ services:
### Ansible provisioner ### Ansible provisioner
Running ansible against `amazon-chroot` requires changing the Ansible connection Running ansible against `amazon-chroot` requires changing the Ansible connection
to chroot. to chroot and running Ansible as root/sudo.
### Using Instances with NVMe block devices. ### Using Instances with NVMe block devices.

10
website/source/docs/builders/virtualbox-iso.html.md.erb
View File

@ -105,7 +105,7 @@ builder.
- `export_opts` (array of strings) - Additional options to pass to the - `export_opts` (array of strings) - Additional options to pass to the
[VBoxManage [VBoxManage
export](https://www.virtualbox.org/manual/ch08.html#vboxmanage-export). This export](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export). This
can be useful for passing product information to include in the resulting can be useful for passing product information to include in the resulting
appliance file. Packer JSON configuration file example: appliance file. Packer JSON configuration file example:
@ -124,9 +124,9 @@ builder.
``` ```
A VirtualBox [VM A VirtualBox [VM
description](https://www.virtualbox.org/manual/ch08.html#idm3756) may description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export-ovf)
contain arbitrary strings; the GUI interprets HTML formatting. However, the may contain arbitrary strings; the GUI interprets HTML formatting. However,
JSON format does not allow arbitrary newlines within a value. Add a the JSON format does not allow arbitrary newlines within a value. Add a
multi-line description by preparing the string in the shell before the multi-line description by preparing the string in the shell before the
packer call like this (shell `>` continuation character snipped for easier packer call like this (shell `>` continuation character snipped for easier
copy & paste): copy & paste):
@ -414,7 +414,7 @@ directory of the SSH user.
In order to perform extra customization of the virtual machine, a template can In order to perform extra customization of the virtual machine, a template can
define extra calls to `VBoxManage` to perform. define extra calls to `VBoxManage` to perform.
[VBoxManage](https://www.virtualbox.org/manual/ch08.html) is the command-line [VBoxManage](https://www.virtualbox.org/manual/ch09.html) is the command-line
interface to VirtualBox where you can completely control VirtualBox. It can be interface to VirtualBox where you can completely control VirtualBox. It can be
used to do things such as set RAM, CPUs, etc. used to do things such as set RAM, CPUs, etc.

10
website/source/docs/builders/virtualbox-ovf.html.md.erb
View File

@ -93,7 +93,7 @@ builder.
- `export_opts` (array of strings) - Additional options to pass to the - `export_opts` (array of strings) - Additional options to pass to the
[VBoxManage [VBoxManage
export](https://www.virtualbox.org/manual/ch08.html#vboxmanage-export). This export](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export). This
can be useful for passing product information to include in the resulting can be useful for passing product information to include in the resulting
appliance file. Packer JSON configuration file example: appliance file. Packer JSON configuration file example:
@ -112,9 +112,9 @@ builder.
``` ```
A VirtualBox [VM A VirtualBox [VM
description](https://www.virtualbox.org/manual/ch08.html#idm3756) may description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export-ovf)
contain arbitrary strings; the GUI interprets HTML formatting. However, the may contain arbitrary strings; the GUI interprets HTML formatting. However,
JSON format does not allow arbitrary newlines within a value. Add a the JSON format does not allow arbitrary newlines within a value. Add a
multi-line description by preparing the string in the shell before the multi-line description by preparing the string in the shell before the
packer call like this (shell `>` continuation character snipped for easier packer call like this (shell `>` continuation character snipped for easier
copy & paste): copy & paste):
@ -356,7 +356,7 @@ directory of the SSH user.
In order to perform extra customization of the virtual machine, a template can In order to perform extra customization of the virtual machine, a template can
define extra calls to `VBoxManage` to perform. define extra calls to `VBoxManage` to perform.
[VBoxManage](https://www.virtualbox.org/manual/ch08.html) is the command-line [VBoxManage](https://www.virtualbox.org/manual/ch09.html) is the command-line
interface to VirtualBox where you can completely control VirtualBox. It can be interface to VirtualBox where you can completely control VirtualBox. It can be
used to do things such as set RAM, CPUs, etc. used to do things such as set RAM, CPUs, etc.

3
website/source/docs/post-processors/vagrant.html.md
View File

@ -33,14 +33,13 @@ providers.
- AWS - AWS
- Azure - Azure
- DigitalOcean - DigitalOcean
- Azure - Docker
- Hyper-V - Hyper-V
- LXC - LXC
- Parallels - Parallels
- QEMU - QEMU
- VirtualBox - VirtualBox
- VMware - VMware
- Docker
-> **Support for additional providers** is planned. If the Vagrant -> **Support for additional providers** is planned. If the Vagrant
post-processor doesn't support creating boxes for a provider you care about, post-processor doesn't support creating boxes for a provider you care about,

2
website/source/docs/provisioners/ansible.html.md
View File

@ -195,7 +195,7 @@ Redhat / CentOS builds have been known to fail with the following error due to
### chroot communicator ### chroot communicator
Building within a chroot (e.g. `amazon-chroot`) requires changing the Ansible Building within a chroot (e.g. `amazon-chroot`) requires changing the Ansible
connection to chroot. connection to chroot and running Ansible as root/sudo.
``` json ``` json
{ {