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

Merge remote-tracking branch 'mitchellh/master'

Browse Source
This commit is contained in:
Jason Costello 2017-03-03 11:03:25 -08:00
commit 99daa5afe0
20 changed files with 160 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG.md
View File

@ -1,5 +1,7 @@
## (Unreleased)
## 0.12.3 (March 1, 2017)
### FEATURES:
* **New builder:** `ebs-surrogate` for building AMIs from EBS volumes. [GH-4351]
@ -19,6 +21,17 @@
* provisioner/ansible: use randomized staging dir [GH-4472]
* communicator/ssh: Use SSH agent when enabled for bastion step. [GH-4598]
* builder/amazon: enable ena when `enhanced_networking` is set. [GH-4578]
* builder/vmware-esxi: try for longer to connect to vnc port. [GH-4480]
[GH-4610]
* core: don't show ui color if we're not colorized. [GH-4525]
* builder/vmware: don't cache ip address so we know if it changes. [GH-4532]
* builder/vmware: allow extra options for ovftool. [GH-4536]
* docs: add community page. [GH-4550]
* post-processor/docker-import: print stderr on docker import failure.
[GH-4529]
* builder/azure:: add two new config variables for temp_compute_name and
temp_resource_group_name. [GH-4468]
### BUG FIXES:
@ -27,10 +40,12 @@
* builder/googlecompute: fix bug when creating image from custom image_family.
[GH-4518]
* builder/virtualbox: remove guest additions before saving image. [GH-4496]
* builder/vmware: ESXi: VNC port timeout increased to 5 s. [GH-4480]
* core: always check for an error first when walking a path. [GH-4467]
* builder/docker: Don't force tag if using a docker version that doesn't
support it. [GH-4560]
* provisioner/chef-client: only upload knife config if we're cleaning.
[GH-4534]
* core: update crypto/ssh lib to fix large file uploads. [GH-4546]
## 0.12.2 (January 20, 2017)

2
builder/vmware/iso/driver_esx5.go
View File

@ -205,7 +205,7 @@ func (d *ESX5Driver) VNCAddress(_ string, portMin, portMax uint) (string, uint,
}
address := fmt.Sprintf("%s:%d", d.Host, port)
log.Printf("Trying address: %s...", address)
l, err := net.DialTimeout("tcp", address, 5*time.Second)
l, err := net.DialTimeout("tcp", address, 30*time.Second)
if err != nil {
if e, ok := err.(*net.OpError); ok {

4
version/version.go
View File

@ -9,12 +9,12 @@ import (
var GitCommit string
// The main version number that is being run at the moment.
const Version = "0.12.3"
const Version = "1.0"
// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
// such as "dev" (in development), "beta", "rc1", etc.
const VersionPrerelease = "dev"
const VersionPrerelease = "rc1"
func FormattedVersion() string {
var versionString bytes.Buffer

2
website/config.rb
View File

@ -2,6 +2,6 @@ set :base_url, "https://www.packer.io/"
activate :hashicorp do |h|
h.name = "packer"
h.version = "0.12.2"
h.version = "0.12.3"
h.github_slug = "mitchellh/packer"
end

18
website/scripts/deploy.sh
View File

@ -28,11 +28,8 @@ if ! command -v "s3cmd" >/dev/null 2>&1; then
exit 1
fi
# Get the parent directory of where this script is and change into our website
# directory
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
DIR="$(cd -P "$( dirname "$SOURCE" )/.." && pwd)"
# Get the parent directory of where this script is and cd there
DIR="$(cd "$(dirname "$(readlink -f "$0")")/.." && pwd)"
# Delete any .DS_Store files for our OS X friends.
find "$DIR" -type f -name '.DS_Store' -delete
@ -51,6 +48,9 @@ if [ -z "$NO_UPLOAD" ]; then
exit 1
fi
# Set browser-side cache-control to ~4h, but tell Fastly to cache for much
# longer. We manually purge the Fastly cache, so setting it to a year is more
# than fine.
s3cmd \
--quiet \
--delete-removed \
@ -59,6 +59,7 @@ if [ -z "$NO_UPLOAD" ]; then
--acl-public \
--recursive \
--add-header="Cache-Control: max-age=14400" \
--add-header="x-amz-meta-surrogate-control: max-age=31536000, stale-white-revalidate=86400, stale-if-error=604800" \
--add-header="x-amz-meta-surrogate-key: site-$PROJECT" \
sync "$DIR/build/" "s3://hc-sites/$PROJECT/latest/"
@ -109,6 +110,13 @@ fi
# Warm the cache with recursive wget.
if [ -z "$NO_WARM" ]; then
echo "Warming Fastly cache..."
echo ""
echo "If this step fails, there are likely missing or broken assets or links"
echo "on the website. Run the following command manually on your laptop, and"
echo "search for \"ERROR\" in the output:"
echo ""
echo "wget --recursive --delete-after https://$PROJECT_URL/"
echo ""
wget \
--recursive \
--delete-after \

30
website/source/assets/images/logo-header.svg Normal file
View File

@ -0,0 +1,30 @@
<svg width="110px" height="42px" viewBox="423 368 183 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<desc>HashiCorp Packer</desc>
<defs>
<polygon id="path-1" points="22.6878 62 0 62 0 0.5562 22.6878 0.5562 22.6878 62"></polygon>
<polygon id="path-3" points="33.7967 0 0.2587 0 0.2587 55.0389996 33.7967 55.0389996 33.7967 1.42108547e-14"></polygon>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(423.000000, 368.000000)">
<path d="M72.5193,24.7828 L66.4223,24.7828 L66.4223,35.7278 L72.5193,35.7278 C75.9273,35.7278 76.9363,34.4798 76.9363,31.8398 L76.9363,28.5758 C76.9363,25.9348 75.8323,24.7828 72.5193,24.7828 L72.5193,24.7828 Z M60.3743,19.4548 L72.8553,19.4548 C80.2483,19.4548 82.9843,22.4788 82.9843,28.0958 L82.9843,32.4638 C82.9843,38.0328 80.0083,41.0568 72.5673,41.0568 L66.4223,41.0568 L66.4223,51.4258 L60.3743,51.4258 L60.3743,19.4548 Z" id="Fill-1" fill="#FFFFFF"></path>
<path d="M97.575,42.5928 L93.255,42.5928 C91.335,42.5928 90.806,43.1208 90.806,44.8978 C90.806,46.5298 91.335,47.2488 93.159,47.2488 C94.887,47.2488 96.471,46.6738 97.575,46.0498 L97.575,42.5928 Z M103.431,51.4258 L98.632,51.4258 L98.199,49.8418 C96.087,51.2338 93.591,51.9058 91.239,51.9058 C86.967,51.9058 85.142,48.9778 85.142,44.9458 C85.142,40.1928 87.207,38.3678 91.959,38.3678 L97.575,38.3678 L97.575,35.9208 C97.575,33.3278 96.855,32.4158 93.111,32.4158 C90.999,32.4158 88.694,32.7038 86.631,33.1348 L85.91,28.6718 C88.118,27.9998 91.335,27.5668 93.927,27.5668 C101.271,27.5668 103.431,30.1598 103.431,36.0158 L103.431,51.4258 Z" id="Fill-3" fill="#FFFFFF"></path>
<path d="M106.9324,42.9288 L106.9324,36.5448 C106.9324,30.2558 109.6684,27.5668 117.0134,27.5668 C118.6464,27.5668 120.9974,27.8548 122.7264,28.4308 L122.0064,33.2318 C120.4214,32.7998 118.3104,32.6078 117.1584,32.6078 C113.7974,32.6078 112.7894,33.6158 112.7894,36.4958 L112.7894,42.9778 C112.7894,45.8578 113.7974,46.8658 117.1584,46.8658 C118.6464,46.8658 120.3264,46.6738 122.0064,46.2418 L122.7264,51.0418 C121.1904,51.5698 118.9344,51.9068 117.0134,51.9068 C109.6684,51.9068 106.9324,49.2178 106.9324,42.9288" id="Fill-5" fill="#FFFFFF"></path>
<path d="M146.2947,28.0474 L139.4297,39.6174 L146.5827,51.4254 L140.1497,51.4254 L133.0937,39.6174 L139.7657,28.0474 L146.2947,28.0474 Z M126.4207,51.4254 L126.4207,18.4944 L132.2767,17.6784 L132.2767,51.4254 L126.4207,51.4254 Z" id="Fill-7" fill="#FFFFFF"></path>
<path d="M153.9256,37.2647 L161.3656,37.2647 L161.3656,36.1117 C161.3656,33.9037 160.6946,32.3677 157.8136,32.3677 C154.9336,32.3677 153.9256,33.9037 153.9256,36.1117 L153.9256,37.2647 Z M158.4856,47.1057 C160.7416,47.1057 163.0936,46.7697 165.6386,46.0007 L166.5506,50.4177 C163.9096,51.4257 160.7416,51.9067 157.9576,51.9067 C150.6126,51.9067 148.0696,48.4967 148.0696,42.8807 L148.0696,36.6887 C148.0696,31.7437 150.2776,27.5667 157.7656,27.5667 C165.2536,27.5667 166.9346,31.9357 166.9346,36.9767 L166.9346,41.9687 L153.9256,41.9687 L153.9256,43.1687 C153.9256,46.0007 154.9336,47.1057 158.4856,47.1057 L158.4856,47.1057 Z" id="Fill-9" fill="#FFFFFF"></path>
<path d="M182.5799,32.9439 C180.3239,33.9519 178.4999,35.0079 176.3879,36.3519 L176.3879,51.4259 L170.5309,51.4259 L170.5309,28.0479 L175.4759,28.0479 L175.8589,30.6389 C177.1549,29.7759 179.9399,28.1429 182.0039,27.5669 L182.5799,32.9439 Z" id="Fill-11" fill="#FFFFFF"></path>
<g id="Group-15" transform="translate(0.000000, 8.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-14"></g>
<polygon id="Fill-13" fill="#71A798" mask="url(#mask-2)" points="-0.0002 0.5562 22.6878 13.6642 22.6878 62.0002 -0.0002 48.8912"></polygon>
</g>
<g id="Group-18" transform="translate(9.000000, 0.000000)">
<mask id="mask-4" fill="white">
<use xlink:href="#path-3"></use>
</mask>
<g id="Clip-17"></g>
<path d="M24.9187,14.2047 L0.2587,-0.0003 L0.2587,9.8647 L17.0267,19.5477 L17.0267,49.1407 L24.9187,53.6737 C29.8017,56.4927 33.7967,54.8037 33.7967,49.9207 L33.7967,28.2077 C33.7967,23.3247 29.8017,17.0237 24.9187,14.2047" id="Fill-16" fill="#567D72" mask="url(#mask-4)"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

2
website/source/assets/stylesheets/_buttons.scss
View File

@ -1,5 +1,5 @@
@mixin button {
font-family: $mono;
font-family: $font-family-open-sans;
height: $button-height;
line-height: $button-height;
background-color: transparent;

1
website/source/assets/stylesheets/_columns.scss
View File

@ -4,7 +4,6 @@
#sidebar-docs,
.docs-body{
flex: 1;
}
}

40
website/source/assets/stylesheets/_components.scss
View File

@ -5,7 +5,6 @@ header .header {
h1 {
margin-bottom: -8px;
margin-top: 60px;
text-transform: uppercase;
}
span {
@ -19,15 +18,19 @@ header .header {
background-position: 35px -40px;
background-size: 100%;
h2 {
margin-top: 70px;
@media (min-width: 1200px) {
h1 {
margin-top: 100px;
}
}
@media (max-width: $screen-md-max) {
height: $hero-height;
h2 {
font-size: 2.1em;
h1 {
font-size: 36px;
padding-top: 1em;
padding-bottom: 1em;
}
}
@ -35,9 +38,10 @@ header .header {
height: auto;
background: none;
h2 {
h1 {
margin: 0;
padding: 1em;
padding-top: 1em;
margin-bottom: 1em;
}
}
}
@ -57,7 +61,6 @@ header .header {
@media (max-width: $screen-sm) {
background: none;
font-size: 75%;
min-height: 50px;
padding: 0;
}
@ -72,16 +75,19 @@ header .header {
}
h2 {
font-family: $serif;
font-size: 44px;
color: #7bc6b1;
margin: 0px;
padding: 0px;
padding-top: 7px;
padding-top: 15px;
padding-bottom: 3px;
line-height: 1.0;
white-space: nowrap;
@media (max-width: $screen-sm) {
font-size: 30px;
}
&:hover {
color: $dark-background;
}
@ -181,7 +187,7 @@ header .header {
color: #b1d631;
font-size: 14px;
font-weight: normal;
font-family: $mono;
font-family: $font-family-mono;
text-shadow: 0 0 0;
}
@ -203,7 +209,6 @@ header .header {
margin-right: 20px;
li {
font-family: $serif;
font-size: 17px;
line-height: (30/17) !important;
margin-bottom: $baseline;
@ -225,10 +230,8 @@ header .header {
}
div.alert {
font-family: $serif;
font-size: 17px;
line-height: 1.5;
letter-spacing: 1px;
margin-left: -135px;
margin-right: -135px;
padding-top: 40px;
@ -256,20 +259,21 @@ header .header {
}
h1 {
font-size: 40px;
line-height: (25/20);
text-transform: uppercase;
font-weight: 600;
}
h2 {
margin-top: $baseline * 2;
text-transform: capitalize;
font-weight: 600;
}
h3 {
margin-top: $baseline;
margin-top: $baseline * 2;
text-transform: capitalize;
font-size: 26px;
font-size: 24px;
font-weight: 600;
}
}
}

35
website/source/assets/stylesheets/_header.scss
View File

@ -9,13 +9,12 @@
background-color: $black;
.navbar-brand {
.logo{
color: $green;
padding-left: 36px;
font-size: 22px;
line-height: 77px;
background: image-url('logo-header.png') 0 0 no-repeat;
@include img-retina("../images/logo-header.png", "../images/logo-header@2x.png", $project-logo-width, $project-logo-height);
background-position: 0 center;
width: 110px;
height: 42px;
line-height: 70px;
margin-top: 15px;
background: image-url('logo-header.svg') 0 0 no-repeat;
font-size: 0;
&:hover{
opacity: .6;
@ -62,7 +61,9 @@
@media (max-width: 768px) {
#header {
.navbar-brand {
.logo{
margin-left: 18px;
}
}
}
}
@ -71,21 +72,9 @@
#header {
.navbar-brand {
.logo{
padding-left: 37px;
font-size: 18px;
@include img-retina("../images/logo-header.png", "../images/logo-header@2x.png", $project-logo-width * .75, $project-logo-height * .75);
//background-position: 0 45%;
}
}
}
}
@media (max-width: 320px) {
#header {
.navbar-brand {
.logo{
font-size: 0 !important; //hide terraform text
width: 84px;
height: 32px;
background-size: contain;;
}
}
}

23
website/source/assets/stylesheets/_helpers.scss
View File

@ -19,7 +19,7 @@ $border-dark: #333;
// base measures
$baseline: 20px;
$base-font-size: 16px;
$base-line-height: 20px;
$base-line-height: 1.5;
$button-height: 60px;
.center {
@ -40,13 +40,13 @@ $sidebar-width: 250px;
//typography
$serif: 'myriad-pro', helvetica, Georgia, serif;
$sans: 'HeimatStencil-SemiBold', 'Avenir', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$mono: 'Inconsolata', 'courier new', courier, monospace;
$font-family-open-sans: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$font-family-klavika: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$font-family-mono: 'Inconsolata', 'Monaco', 'courier new', courier, monospace;
.serif { font-family: $serif; }
.sans { font-family: $sans; }
.mono { font-family: $mono; }
.open-sans { font-family: $font-family-open-sans;}
.klavika { font-family: $font-family-klavika; }
.mono { font-family: $font-family-mono; }
.text-center { text-align: center !important; }
.text-left { text-align: left !important; }
@ -56,15 +56,6 @@ $mono: 'Inconsolata', 'courier new', courier, monospace;
.uppercase { text-transform: uppercase !important; }
@font-face {
font-family: 'HeimatStencil-SemiBold';
src: font-url('2772B2_0_0.eot');
src: font-url('2772B2_0_0.woff') format('woff'),
font-url('2772B2_0_0.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
//color
.dark-background {
background-color: #000;

2
website/source/assets/stylesheets/_reset.scss
View File

@ -9,7 +9,7 @@ form, input, textarea, button {
-khtml-border-radius: 0;
border-radius: 0;
background-color: transparent;
font-family: $mono;
font-family: $font-family-mono;
font-size: $base-font-size;
line-height: 1.0;
color: inherit;

2
website/source/assets/stylesheets/_sidebar.scss
View File

@ -3,7 +3,7 @@
max-width: 320px;
$border: 1px solid $gray-dark;
font-size: 16px;
font-family: $mono;
font-family: $font-family-mono;
color: $gray-light;
background-color: $sidebar-background-color;

37
website/source/assets/stylesheets/_styles.scss
View File

@ -17,20 +17,22 @@ html {
body {
background-color: $background;
font-family: $sans;
letter-spacing: 1px;
font-family: $font-family-open-sans;
font-size: $base-font-size;
font-weight: 400;
line-height: $base-line-height;
}
h1, h2, h3, h4, h5, h6 {
letter-spacing: 2px;
font-weight: normal;
.home {
h1, h2, h3, h4, h5, h6 {
font-family: $font-family-klavika;
letter-spacing: 1px;
font-weight: normal;
}
}
h1 {
font-family: $sans;
font-size: 70px;
font-size: 42px;
line-height: (80/70);
@include respond-to(mobile) {
font-size: 50px;
@ -39,9 +41,9 @@ h1 {
}
h2 {
font-family: $sans;
font-size: 40px;
font-size: 36px;
line-height: (50/40);
text-transform: uppercase;
&.has-dividers {
//overflow: auto !important;
@ -55,38 +57,31 @@ h2 {
}
h3 {
font-family: $sans;
font-size: 20px;
font-size: 24px;
line-height: (30/20);
}
h4 {
font-family: $mono;
font-family: $font-family-mono;
font-size: 20px;
line-height: (30/20);
}
h5 {
font-family: $sans;
font-size: 16px;
line-height: (22/16);
}
h6 {
font-family: $mono;
font-family: $font-family-mono;
font-size: 16px;
line-height: (22/16);
}
p {
font-family: $serif;
font-size: 17px;
line-height: (30/17);
letter-spacing: 1px;
&.large-text {
font-size: 20px;
line-height: (35/20);
}
a {
@ -121,10 +116,8 @@ dt {
}
dd {
font-family: $serif;
font-size: 17px;
line-height: 1.5;
letter-spacing: 1px;
margin-bottom: 30px;
}
@ -159,7 +152,7 @@ pre {
}
table {
font-family: $mono;
font-family: $font-family-mono;
margin: ($baseline * 2) 0;
color: $gray-dark;

9
website/source/docs/builders/amazon.html.md
View File

@ -27,7 +27,7 @@ Packer supports the following builders at the moment:
that device. This is an **advanced builder and should not be used by
newcomers**. However, it is also the fastest way to build an EBS-backed AMI
since no new EC2 instance needs to be launched.
- [amazon-ebssurrogate](/docs/builders/amazone-ebssurrogate.html) - Create EBS
-backed AMIs from scratch. Works similarly to the `chroot` builder but does
not require running in AWS. This is an **advanced builder and should not be
@ -78,8 +78,11 @@ following steps:
2. Look for [local AWS configuration
files](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-config-files)
- First `~/.aws/credentials`
- Next based on `AWS_PROFILE`
- Looks for the credentials file in the `AWS_SHARED_CREDENTIALS_FILE`
environment variable, and if that's empty, use the default credentials
file (`.aws/credentials`) in the user's home directory.
- Uses the profile name set in the `AWS_PROFILE` environment variable. If
the environment variable is not set, uses "default" as the profile name.
3. Lookup an IAM role for the current EC2 instance (if you're running in EC2)

1
website/source/docs/builders/triton.html.md
View File

@ -8,6 +8,7 @@ description: |
Triton "VM to image" functionality to create a reusable image and finally
destroys the temporary VM. This reusable image can then be used to launch new
VM's.
layout: docs
page_title: Triton Builder
...

21
website/source/docs/installation.html.md
View File

@ -86,3 +86,24 @@ party, so it may not be the latest available version.
``` {.text}
$ choco install packer
```
### NuGet
If you want to use Packer on Windows in an automated build, you can use
Packer from a [nuget.org](https://nuget.org) package in either the
[64-bit](https://www.nuget.org/packages/Packer.Windows.x64/) or
[32-bit](https://www.nuget.org/packages/Packer.Windows.x86/) version. Remember
that this is updated by a 3rd party, so it may not be the latest available
version.
Install the 64-bit version
``` {.text}
$ nuget install packer.windows.x64
```
Install the 32-bit version
``` {.text}
$ nuget install packer.windows.x86
```

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

@ -76,7 +76,7 @@ the covers, rsync may or may not be used.
The behavior when uploading symbolic links depends on the communicator. The
Docker communicator will preserve symlinks, but all other communicators will
treat local symlinks as regular files. If you wish the preserve symlinks when
treat local symlinks as regular files. If you wish to preserve symlinks when
uploading, it's recommended that you use `tar`. Below is an example of what
that might look like:

6
website/source/index.html.erb
View File

@ -7,10 +7,10 @@ description: Packer is a free and open source tool for creating golden images
<header class="dark-background">
<div class="container hero">
<div class="row">
<div class="col-md-4 col-md-offset-1">
<h2>
<div class="col-md-6">
<h1>
<span class="text-green">Packer</span> is a tool for creating machine and container images for multiple platforms from a single source configuration.
</h2>
</h1>
</div>
</div>
</div>

12
website/source/layouts/layout.erb
View File

@ -13,12 +13,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="shortcut icon" href="<%= image_path(" favicon.ico ") %>" type="image/x-icon">
<link rel="icon" href="<%= image_path(" favicon.ico ") %>" type="image/x-icon">
<script type="text/javascript" src="//use.typekit.net/apr3jjs.js"></script>
<script type="text/javascript">
try {
Typekit.load();
} catch (e) {}
</script>
<!-- Google Tag Manager -->
<script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@ -28,6 +23,11 @@
})(window,document,'script','dataLayer','GTM-NR2SD7C');
</script>
<!-- End Google Tag Manager -->
<!-- Typekit script to import Klavika -->
<script src="https://use.typekit.net/wxf7mfi.js"></script>
<script>try{Typekit.load({ async: true });}catch(e){}</script>
</head>
<body id="page-<%= current_page.data.page_title ? "#{current_page.data.page_title}" : "home" %>" class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>">
<!-- Google Tag Manager (noscript) -->