From b7dc0e7558a25072d2e9d8e68a017be8854748c6 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Sun, 7 Jun 2020 18:27:09 +0200 Subject: [PATCH] Update build * Update to Ruby 2.6.x. * Bump Gemfile vendor locking. Signed-off-by: Ben Kochie --- .ruby-version | 2 +- Dockerfile | 15 ++++++---- Gemfile.lock | 80 +++++++++++++++++++++++++++++---------------------- 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/.ruby-version b/.ruby-version index 097a15a2a..952f449f1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.2 +2.6.6 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4edb230c8..527fd8f4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ -FROM ruby:2.4-onbuild -EXPOSE 3000 -RUN bundle exec nanoc -CMD bundle exec nanoc view --host 0.0.0.0 -VOLUME output +FROM ruby:2.6 +EXPOSE 3000 +WORKDIR /usr/src/app +COPY Gemfile /usr/src/app/ +COPY Gemfile.lock /usr/src/app/ +RUN bundle install +COPY . /usr/src/app +RUN bundle exec nanoc --verbose +CMD bundle exec nanoc view --host 0.0.0.0 +VOLUME output diff --git a/Gemfile.lock b/Gemfile.lock index 0b5d7a279..b9764b24a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,10 +6,10 @@ GEM adsf (1.4.3) rack (>= 1.0.0, < 3.0.0) builder (3.2.4) - coderay (1.1.2) + coderay (1.1.3) colored (1.2) - concurrent-ruby (1.1.5) - cri (2.15.9) + concurrent-ruby (1.1.6) + cri (2.15.10) ddmemoize (1.0.0) ddmetrics (~> 1.0) ref (~> 2.0) @@ -21,9 +21,9 @@ GEM http_parser.rb (~> 0.6.0) equatable (0.6.1) eventmachine (1.2.7) - ffi (1.11.3) + ffi (1.13.0) formatador (0.2.5) - guard (2.16.1) + guard (2.16.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -38,36 +38,43 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-nanoc (2.1.7) + guard-nanoc (2.1.9) guard (~> 2.8) guard-compat (~> 1.0) - nanoc (>= 4.11.13, < 5.0) + nanoc-cli (~> 4.11, >= 4.11.14) + nanoc-core (~> 4.11, >= 4.11.14) hamster (3.0.0) concurrent-ruby (~> 1.0) http_parser.rb (0.6.0) json_schema (0.20.8) - kramdown (2.1.0) + kramdown (2.2.1) + rexml listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.1.0) - method_source (0.9.2) + lumberjack (1.2.5) + method_source (1.0.0) mini_portile2 (2.4.0) multi_json (1.14.1) - nanoc (4.11.14) + nanoc (4.11.16) addressable (~> 2.5) colored (~> 1.2) - nanoc-cli (= 4.11.14) - nanoc-core (= 4.11.14) + nanoc-checking (~> 1.0) + nanoc-cli (= 4.11.16) + nanoc-core (= 4.11.16) + nanoc-deploying (~> 1.0) parallel (~> 1.12) tty-command (~> 0.8) tty-which (~> 0.4) - nanoc-cli (4.11.14) + nanoc-checking (1.0.0) + nanoc-cli (~> 4.11, >= 4.11.15) + nanoc-core (~> 4.11, >= 4.11.15) + nanoc-cli (4.11.16) cri (~> 2.15) diff-lcs (~> 1.3) - nanoc-core (= 4.11.14) + nanoc-core (= 4.11.16) zeitwerk (~> 2.1) - nanoc-core (4.11.14) + nanoc-core (4.11.16) ddmemoize (~> 1.0) ddmetrics (~> 1.0) ddplugin (~> 1.0) @@ -77,53 +84,58 @@ GEM tomlrb (~> 1.2) tty-platform (~> 0.2) zeitwerk (~> 2.1) + nanoc-deploying (1.0.0) + nanoc-checking (~> 1.0) + nanoc-cli (~> 4.11, >= 4.11.15) + nanoc-core (~> 4.11, >= 4.11.15) nenv (0.3.0) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) parallel (1.19.1) - pastel (0.7.3) + pastel (0.7.4) equatable (~> 0.6) tty-color (~> 0.5) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (4.0.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (4.0.5) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.8) + rack (2.2.2) rb-fchange (0.0.6) ffi - rb-fsevent (0.10.3) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) ref (2.0.0) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) shellany (0.0.1) slow_enumerator_tools (1.1.0) thor (1.0.1) - tomlrb (1.2.9) - tty-color (0.5.0) + tomlrb (1.3.0) + tty-color (0.5.1) tty-command (0.9.0) pastel (~> 0.7.0) - tty-platform (0.2.1) - tty-which (0.4.1) - zeitwerk (2.2.2) + tty-platform (0.3.0) + tty-which (0.4.2) + zeitwerk (2.3.0) PLATFORMS ruby @@ -144,4 +156,4 @@ DEPENDENCIES rspec BUNDLED WITH - 1.17.2 + 2.1.4