website: Update middleman-hashicorp container and Gemfile.lock (#6374)
* website: Update middleman-hashicorp container and Gemfile.lock Time marches on, and so do security vulnerabilities in Nokogiri. So it's time for a new container. As with last time, here's a reminder for the next person who needs to update this: - You shouldn't just update the dependency in Gemfile.lock, because your build times will go to heck as you compile Nokogiri from source on every run. So you need an updated container with all the dependencies. - To update the container, you need to push a new tag to the middleman-hashicorp repo. Teamcity does the rest, and will ship a new container to Docker Hub (unless its credentials are out of date, in which case go ask team-eng-serv.) - Once that's pushed: - Update Makefile - Update the Gemfile - Delete Gemfile.lock - `make website` until it comes up, then ctrl-C - Commit the changes * website: Specify a different json version in Gemfile.lock The Consul website uses different containers for preview and deploy, and this oddball JSON version was causing issues. This commit sacrifices a little bit of preview startup speed for (hopefully) working deploys.
This commit is contained in:
parent
c87285e3a9
commit
e4e3fd4299
|
@ -1,3 +1,3 @@
|
||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
gem "middleman-hashicorp", "0.3.35"
|
gem "middleman-hashicorp", "0.3.41"
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
activesupport (4.2.10)
|
activesupport (4.2.11.1)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
autoprefixer-rails (9.4.10)
|
autoprefixer-rails (9.6.1)
|
||||||
execjs
|
execjs
|
||||||
bootstrap-sass (3.4.1)
|
bootstrap-sass (3.4.1)
|
||||||
autoprefixer-rails (>= 5.2.1)
|
autoprefixer-rails (>= 5.2.1)
|
||||||
|
@ -18,7 +18,7 @@ GEM
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
xpath (~> 2.0)
|
xpath (~> 2.0)
|
||||||
chunky_png (1.3.10)
|
chunky_png (1.3.11)
|
||||||
coffee-script (2.4.1)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
|
@ -41,8 +41,8 @@ GEM
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.2.7)
|
eventmachine (1.2.7)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
ffi (1.9.25)
|
ffi (1.11.1)
|
||||||
haml (5.0.4)
|
haml (5.1.2)
|
||||||
temple (>= 0.8.0)
|
temple (>= 0.8.0)
|
||||||
tilt
|
tilt
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
|
@ -51,7 +51,7 @@ GEM
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
json (2.1.0)
|
json (2.1.0)
|
||||||
kramdown (1.16.2)
|
kramdown (1.17.0)
|
||||||
listen (3.0.8)
|
listen (3.0.8)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
rb-inotify (~> 0.9, >= 0.9.7)
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
|
@ -78,7 +78,7 @@ GEM
|
||||||
rack (>= 1.4.5, < 2.0)
|
rack (>= 1.4.5, < 2.0)
|
||||||
thor (>= 0.15.2, < 2.0)
|
thor (>= 0.15.2, < 2.0)
|
||||||
tilt (~> 1.4.1, < 2.0)
|
tilt (~> 1.4.1, < 2.0)
|
||||||
middleman-hashicorp (0.3.35)
|
middleman-hashicorp (0.3.41)
|
||||||
bootstrap-sass (~> 3.3)
|
bootstrap-sass (~> 3.3)
|
||||||
builder (~> 3.2)
|
builder (~> 3.2)
|
||||||
middleman (~> 3.4)
|
middleman (~> 3.4)
|
||||||
|
@ -95,16 +95,16 @@ GEM
|
||||||
sprockets (~> 2.12.1)
|
sprockets (~> 2.12.1)
|
||||||
sprockets-helpers (~> 1.1.0)
|
sprockets-helpers (~> 1.1.0)
|
||||||
sprockets-sass (~> 1.3.0)
|
sprockets-sass (~> 1.3.0)
|
||||||
middleman-syntax (3.0.0)
|
middleman-syntax (3.2.0)
|
||||||
middleman-core (>= 3.2)
|
middleman-core (>= 3.2)
|
||||||
rouge (~> 2.0)
|
rouge (~> 3.2)
|
||||||
mime-types (3.1)
|
mime-types (3.2.2)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2019.0331)
|
||||||
mini_portile2 (2.4.0)
|
mini_portile2 (2.4.0)
|
||||||
minitest (5.11.3)
|
minitest (5.11.3)
|
||||||
multi_json (1.13.1)
|
multi_json (1.13.1)
|
||||||
nokogiri (1.10.1)
|
nokogiri (1.10.4)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
padrino-helpers (0.12.9)
|
padrino-helpers (0.12.9)
|
||||||
i18n (~> 0.6, >= 0.6.7)
|
i18n (~> 0.6, >= 0.6.7)
|
||||||
|
@ -115,18 +115,16 @@ GEM
|
||||||
rack (1.6.11)
|
rack (1.6.11)
|
||||||
rack-livereload (0.3.17)
|
rack-livereload (0.3.17)
|
||||||
rack
|
rack
|
||||||
rack-test (1.0.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rake (12.3.2)
|
|
||||||
rb-fsevent (0.10.3)
|
rb-fsevent (0.10.3)
|
||||||
rb-inotify (0.9.10)
|
rb-inotify (0.10.0)
|
||||||
ffi (>= 0.5.0, < 2)
|
ffi (~> 1.0)
|
||||||
redcarpet (3.4.0)
|
redcarpet (3.5.0)
|
||||||
rouge (2.2.1)
|
rouge (3.9.0)
|
||||||
sass (3.4.25)
|
sass (3.4.25)
|
||||||
sassc (2.0.1)
|
sassc (2.1.0-x86_64-linux)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.9)
|
||||||
rake
|
|
||||||
sprockets (2.12.5)
|
sprockets (2.12.5)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
@ -137,13 +135,13 @@ GEM
|
||||||
sprockets-sass (1.3.1)
|
sprockets-sass (1.3.1)
|
||||||
sprockets (~> 2.0)
|
sprockets (~> 2.0)
|
||||||
tilt (~> 1.1)
|
tilt (~> 1.1)
|
||||||
temple (0.8.0)
|
temple (0.8.1)
|
||||||
thor (0.20.0)
|
thor (0.20.3)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
turbolinks (5.1.1)
|
turbolinks (5.2.0)
|
||||||
turbolinks-source (~> 5.1)
|
turbolinks-source (~> 5.2)
|
||||||
turbolinks-source (5.1.0)
|
turbolinks-source (5.2.0)
|
||||||
tzinfo (1.2.5)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uber (0.0.15)
|
uber (0.0.15)
|
||||||
|
@ -157,7 +155,7 @@ PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
middleman-hashicorp (= 0.3.35)
|
middleman-hashicorp (= 0.3.41)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.16.1
|
1.17.3
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
VERSION?="0.3.40"
|
VERSION?="0.3.41"
|
||||||
|
|
||||||
# The volume mounting steps are a way to exclude all the consul docs from being built
|
# The volume mounting steps are a way to exclude all the consul docs from being built
|
||||||
# in the Consul site build process while still including the index.html page that points
|
# in the Consul site build process while still including the index.html page that points
|
||||||
|
|
Loading…
Reference in New Issue