diff --git a/Gemfile b/Gemfile index 9398d1df9..d4247ee43 100644 --- a/Gemfile +++ b/Gemfile @@ -55,8 +55,10 @@ gem 'coffee-rails' # Using mini_racer instead of nodejs, because of errors on Jenkins. # mini_racer can only be built with gcc >= 4.7. Our Jenkins uses 4.4.7 +# Lock libv8 because mini_racer doesn't. -_- +gem 'libv8' gem 'mini_racer' -gem 'sass-rails', '~> 5' +gem 'sass-rails' # , '~> 5' gem 'uglifier' # Locked to 3.3.x, because 3.4.0 expects sassc, which can only be built with gcc diff --git a/Gemfile.lock b/Gemfile.lock index edfbe9af2..ac595bae4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -258,7 +258,7 @@ GEM kaminari (>= 0.13.0) rails kaminari-core (1.2.1) - libv8 (6.7.288.46.1) + libv8 (8.4.255.0) loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -272,8 +272,8 @@ GEM mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.4.0) - mini_racer (0.2.4) - libv8 (>= 6.3) + mini_racer (0.3.1) + libv8 (~> 8.4.255) minitest (5.14.2) minitest-reporters (1.3.6) ansi @@ -552,6 +552,7 @@ DEPENDENCIES jquery-ui-rails kaminari kaminari-bootstrap + libv8 mini_racer minitest-reporters mocha @@ -584,7 +585,7 @@ DEPENDENCIES rubocop-minitest rubocop-performance rubocop-rails - sass-rails (~> 5) + sass-rails sdoc seed-fu selectize-rails diff --git a/images/s2i/Dockerfile b/images/s2i/Dockerfile index 5cc2255e3..dce3afef7 100644 --- a/images/s2i/Dockerfile +++ b/images/s2i/Dockerfile @@ -10,7 +10,7 @@ RUN \ set -x && \ yum install -y \ # for active storage gem - ImageMagick poppler libpoppler && \ + v8 ImageMagick poppler libpoppler && \ # Call restore-artifacts sscript when assembling sed '/Installing application source/i $STI_SCRIPTS_PATH/restore-artifacts' \ -i $STI_SCRIPTS_PATH/assemble && \