From ba3aa81841034d0ef164b13af3aa3e321d5b18df Mon Sep 17 00:00:00 2001 From: Nick Fagerlund Date: Wed, 21 Aug 2019 16:08:55 -0700 Subject: [PATCH] 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/Gemfile | 2 +- website/Gemfile.lock | 66 +++++++++++++++++++++++--------------------- website/Makefile | 2 +- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/website/Gemfile b/website/Gemfile index 975949205..928dcea37 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "middleman-hashicorp", "0.3.35" +gem "middleman-hashicorp", "0.3.41" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index c335225a8..17e360c38 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (8.2.0) + autoprefixer-rails (9.6.1) execjs - bootstrap-sass (3.3.7) + bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + sassc (>= 2.0.0) builder (3.2.3) capybara (2.4.4) mime-types (>= 1.16) @@ -18,7 +18,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - chunky_png (1.3.10) + chunky_png (1.3.11) coffee-script (2.4.1) coffee-script-source execjs @@ -39,10 +39,10 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.2.5) + eventmachine (1.2.7) execjs (2.7.0) - ffi (1.9.23) - haml (5.0.4) + ffi (1.11.1) + haml (5.1.2) temple (>= 0.8.0) tilt hike (1.2.3) @@ -50,8 +50,8 @@ GEM uber (~> 0.0.14) http_parser.rb (0.6.0) i18n (0.7.0) - json (2.1.0) - kramdown (1.16.2) + json (1.8.3.1) + kramdown (1.17.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.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.35) + middleman-hashicorp (0.3.41) bootstrap-sass (~> 3.3) builder (~> 3.2) middleman (~> 3.4) @@ -95,35 +95,37 @@ GEM sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.3.0) - middleman-syntax (3.0.0) + middleman-syntax (3.2.0) middleman-core (>= 3.2) - rouge (~> 2.0) - mime-types (3.1) + rouge (~> 3.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) + mime-types-data (3.2019.0331) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) padrino-helpers (0.12.9) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.9) tilt (>= 1.4.1, < 3) padrino-support (0.12.9) activesupport (>= 3.1) - rack (1.6.9) + rack (1.6.11) rack-livereload (0.3.17) rack - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rouge (2.2.1) + rb-inotify (0.10.0) + ffi (~> 1.0) + redcarpet (3.5.0) + rouge (3.9.0) sass (3.4.25) - sprockets (2.12.4) + sassc (2.1.0-x86_64-linux) + ffi (~> 1.9) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -133,13 +135,13 @@ GEM sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - temple (0.8.0) - thor (0.20.0) + temple (0.8.1) + thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) - turbolinks (5.1.0) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) tzinfo (1.2.5) thread_safe (~> 0.1) uber (0.0.15) @@ -153,7 +155,7 @@ PLATFORMS ruby DEPENDENCIES - middleman-hashicorp (= 0.3.35) + middleman-hashicorp (= 0.3.41) BUNDLED WITH - 1.16.1 + 1.17.3 diff --git a/website/Makefile b/website/Makefile index 7497725e4..c48ffb082 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,4 +1,4 @@ -VERSION?="0.3.35" +VERSION?="0.3.41" build: @echo "==> Starting build in Docker..."