Ruby upgrade to 2.4.4 (#320)

* ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * [Security] Bump i18n from 0.7.0 to 0.9.5 (#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * basic map unit tests (#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * update readme.md (#335) solve the beginner issue of database * ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * gemfile.lock update * gemfile.lock update
publiclab · Feb 20, 2019 · a9c3bf7 · a9c3bf7
1 parent bf0b340
commit a9c3bf7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile # Mapknitter
 # https://github.com/publiclab/mapknitter/
 
-FROM ruby:2.1.2
+FROM ruby:2.4.4-stretch
 MAINTAINER Sebastian Silva "sebastian@fuentelibre.org"
 
 LABEL This image deploys Mapknitter!
@@ -11,7 +11,8 @@ RUN mkdir -p /app
 ENV HOME /root
 
 # Install dependencies
-RUN apt-get update -qq && apt-get install -y bundler libmysqlclient-dev ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev gdal-bin python-gdal curl libcurl4-openssl-dev libssl-dev zip nodejs-legacy npm ##ALSO TRIED: ruby-pg
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt-get update -qq && apt-get install -y bundler default-libmysqlclient-dev ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev gdal-bin python-gdal curl libcurl4-openssl-dev libssl-dev zip nodejs ##ALSO TRIED: ruby-pg
 RUN npm install -g bower
 
 # Install bundle of gems

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.1.2"
+ruby "2.4.4"
 gem "rails", "~>3.2"
 gem 'rake',  '~> 12.3.2'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.11.1)
+    ZenTest (4.11.2)
     actionmailer (3.2.22.5)
       actionpack (= 3.2.22.5)
       mail (~> 2.5.4)
@@ -32,27 +32,28 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    autoprefixer-rails (6.6.1)
+    autoprefixer-rails (9.4.7)
       execjs
     aws-sdk (1.5.8)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     builder (3.0.4)
-    climate_control (0.1.0)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     concurrent-ruby (1.1.4)
     erubis (2.7.0)
     execjs (2.7.0)
+    ffi (1.10.0)
     friendly_id (4.0.10.1)
       activerecord (>= 3.0, < 4.0)
-    geokit (1.10.0)
+    geokit (1.13.1)
     geokit-rails (1.1.4)
       geokit (>= 1.5.0)
     hike (1.2.3)
-    httparty (0.15.6)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -64,16 +65,16 @@ GEM
       multi_json (>= 1.3)
       rake
     json (1.8.6)
-    libv8 (3.16.14.17)
-    mail (2.5.4)
+    libv8 (3.16.14.19)
+    mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile2 (2.4.0)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
-    nokogiri (1.9.1)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     oa-core (0.3.2)
     oa-openid (0.3.2)
@@ -87,13 +88,13 @@ GEM
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
-    passenger (5.1.1)
+    passenger (6.0.1)
       rack
       rake (>= 0.8.1)
     polyglot (0.3.5)
-    power_assert (0.4.1)
+    power_assert (1.1.3)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.8.0)
       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -118,10 +119,13 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rdiscount (2.2.0.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    recaptcha (4.9.0)
+    recaptcha (4.13.1)
       json
     ref (2.0.0)
     right_aws (3.1.0)
@@ -130,25 +134,29 @@ GEM
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
-    sass (3.4.23)
+    sass (3.7.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.13)
-    test-unit (3.2.3)
+    sqlite3 (1.4.0)
+    test-unit (3.3.0)
       power_assert
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.4)
+    thor (0.20.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.52)
-    uglifier (3.0.4)
+    tzinfo (0.3.55)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     uuidtools (2.1.5)
     will_paginate (3.1.6)
@@ -187,7 +195,7 @@ DEPENDENCIES
   will_paginate-bootstrap
 
 RUBY VERSION
-   ruby 2.1.2p95
+   ruby 2.4.4p296
 
 BUNDLED WITH
-   1.17.3
+   1.16.2