Merge pull request #2005 from hashicorp/sethvargo/docs_fix

Make downloads great again
This commit is contained in:
Seth Vargo 2016-11-17 13:53:12 -05:00 committed by GitHub
commit d7829340ad
5 changed files with 17 additions and 45 deletions

View File

@ -1,3 +1,3 @@
source "https://rubygems.org"
gem "middleman-hashicorp", "0.3.5"
gem "middleman-hashicorp", "0.3.6"

View File

@ -7,7 +7,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
autoprefixer-rails (6.5.1.1)
autoprefixer-rails (6.5.3)
execjs
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
@ -19,7 +19,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chunky_png (1.3.7)
chunky_png (1.3.8)
coffee-script (2.4.1)
coffee-script-source
execjs
@ -40,7 +40,7 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.0.1)
eventmachine (1.2.1)
execjs (2.7.0)
ffi (1.9.14)
haml (4.0.7)
@ -78,7 +78,7 @@ GEM
rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
middleman-hashicorp (0.3.5)
middleman-hashicorp (0.3.6)
bootstrap-sass (~> 3.3)
builder (~> 3.2)
middleman (~> 3.4)
@ -111,7 +111,7 @@ GEM
tilt (~> 1.4.1)
padrino-support (0.12.8.1)
activesupport (>= 3.1)
rack (1.6.4)
rack (1.6.5)
rack-livereload (0.3.16)
rack
rack-test (0.6.3)
@ -148,7 +148,7 @@ PLATFORMS
ruby
DEPENDENCIES
middleman-hashicorp (= 0.3.5)
middleman-hashicorp (= 0.3.6)
BUNDLED WITH
1.13.6

View File

@ -1,4 +1,4 @@
VERSION?="0.3.5"
VERSION?="0.3.6"
website:
@echo "==> Starting website in Docker..."

View File

@ -8,7 +8,7 @@
"builders": [
{
"type": "docker",
"image": "hashicorp/middleman-hashicorp:0.3.5",
"image": "hashicorp/middleman-hashicorp:0.3.6",
"discard": "true",
"run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
}

View File

@ -31,51 +31,23 @@ description: |-
</div>
</div>
<% product_versions.each do |os, arches| %>
<% next if os == "web" %>
<div class="row">
<div class="col-md-12 download">
<div class="icon pull-left"><img src="/assets/images/icons/icon_darwin.png" /></div>
<div class="icon pull-left"><%= system_icon(os) %></div>
<div class="details">
<h2 class="os-name">Mac OS X</h2>
<h2 class="os-name"><%= pretty_os(os) %></h2>
<ul>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_darwin_amd64.zip">64-bit</a></li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 download">
<div class="icon pull-left"><img src="/assets/images/icons/icon_linux.png" /></div>
<div class="details">
<h2 class="os-name">Linux</h2>
<ul>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_386.zip">32-bit</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_amd64.zip">64-bit</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_arm.zip">Arm</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_arm5.zip">Arm5</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_arm6.zip">Arm6</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_arm7.zip">Arm7</a></li>
</ul>
<ul>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_linux_amd64_lxc.zip">64-bit with LXC</a> (requires liblxc installed)</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 download">
<div class="icon pull-left"><img src="/assets/images/icons/icon_windows.png" /></div>
<div class="details">
<h2 class="os-name">Windows</h2>
<ul>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_windows_386.zip">32-bit</a></li>
<li><a href="https://releases.hashicorp.com/nomad/0.5.0/nomad_0.5.0_windows_amd64.zip">64-bit</a></li>
<% arches.each do |arch, url| %>
<li><a href="<%= url %>"><%= pretty_arch(arch) %></a></li>
<% end %>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
<% end %>
<div class="row">
<div class="col-md-12 poweredby">