Merge branch 'master' of github.com:hashicorp/nomad

hashicorp · Mar 15, 2017 · e943b95 · e943b95
2 parents 6d74650 + d964077
commit e943b95
Show file tree

Hide file tree

Showing 35 changed files with 364 additions and 1,151 deletions.
diff --git a/client/driver/driver_test.go b/client/driver/driver_test.go
@@ -180,6 +180,10 @@ func setupTaskEnv(t *testing.T, driver string) (*allocdir.TaskDir, map[string]st
 		"NOMAD_ADDR_admin":              "1.2.3.4:8081",
 		"NOMAD_ADDR_web_main":           "192.168.0.100:5000",
 		"NOMAD_ADDR_web_http":           "192.168.0.100:2000",
+		"NOMAD_IP_web_main":             "192.168.0.100",
+		"NOMAD_IP_web_http":             "192.168.0.100",
+		"NOMAD_PORT_web_http":           "2000",
+		"NOMAD_PORT_web_main":           "5000",
 		"NOMAD_IP_admin":                "1.2.3.4",
 		"NOMAD_PORT_admin":              "8081",
 		"NOMAD_HOST_PORT_admin":         "8081",

diff --git a/website/Gemfile b/website/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "middleman-hashicorp", "0.3.13"
+gem "middleman-hashicorp", "0.3.14"
diff --git a/website/Gemfile.lock b/website/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    autoprefixer-rails (6.7.6)
+    autoprefixer-rails (6.7.7)
       execjs
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
@@ -77,7 +77,7 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-hashicorp (0.3.13)
+    middleman-hashicorp (0.3.14)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       middleman (~> 3.4)
@@ -151,7 +151,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman-hashicorp (= 0.3.13)
+  middleman-hashicorp (= 0.3.14)
 
 BUNDLED WITH
    1.14.6
diff --git a/website/Makefile b/website/Makefile
@@ -1,4 +1,4 @@
-VERSION?="0.3.13"
+VERSION?="0.3.14"
 
 website:
 	@echo "==> Starting website in Docker..."

diff --git a/website/packer.json b/website/packer.json
@@ -8,7 +8,7 @@
   "builders": [
     {
       "type": "docker",
-      "image": "hashicorp/middleman-hashicorp:0.3.13",
+      "image": "hashicorp/middleman-hashicorp:0.3.14",
       "discard": "true",
       "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
     }

diff --git a/website/source/assets/images/logo-header.svg → website/source/assets/images/logo-text.svg b/website/source/assets/images/logo-header.svg → website/source/assets/images/logo-text.svg
diff --git a/website/source/assets/images/logo.svg b/website/source/assets/images/logo.svg
diff --git a/website/source/assets/stylesheets/_buttons.scss b/website/source/assets/stylesheets/_buttons.scss
@@ -22,13 +22,13 @@
   }
 
   &.lrg{
-    font-size: $font-size-reg;
+    font-size: $font-size;
     padding: 10px 24px;
   }
 
   &.sml{
     padding: 8px 14px;
-    font-size: $font-size-reg - 2;
+    font-size: $font-size - 2;
     line-height: 14px;
 
     &.has-caret{

diff --git a/website/source/assets/stylesheets/_community.scss b/website/source/assets/stylesheets/_community.scss
@@ -4,11 +4,6 @@
   .person {
     margin-bottom: 40px;
 
-    h3 {
-      color: $blue-dark;
-      text-transform: none;
-    }
-
     img {
       width: 125px;
       margin: auto auto;