From a99458f02b08cb2e5fb795d5a8358f0c0d0657d7 Mon Sep 17 00:00:00 2001 From: Luiz Picolo Date: Tue, 5 Oct 2021 10:22:47 -0400 Subject: [PATCH] Update --- Dockerfile | 9 +++++++- Gemfile | 3 ++- Gemfile.lock | 61 +++++++++++++++++++++++++++------------------------- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8dffe1b..4d585c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,16 @@ FROM ruby:2.7.1 +RUN apt-get update && apt-get install -y +RUN apt-get install -y nodejs sqlite3 +RUN apt-get install npm -y + WORKDIR /code COPY . /code + +RUN cd public && npm install +RUN cd .. RUN bundle install EXPOSE 4567 -CMD ["bundle", "exec", "rackup", "--host", "0.0.0.0", "-p", "4567"] \ No newline at end of file +CMD ["bundle", "exec", "puma", "-p", "4567"] \ No newline at end of file diff --git a/Gemfile b/Gemfile index 8630463..7c8fdaa 100644 --- a/Gemfile +++ b/Gemfile @@ -11,4 +11,5 @@ gem 'sinatra-activerecord' gem 'chartkick' gem 'rerun' gem 'sqlite3' -gem 'rake' \ No newline at end of file +gem 'rake' +gem 'puma' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index bdd2997..85ecd7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,60 +1,62 @@ GEM remote: https://rubygems.org/ specs: - activemodel (6.0.3.5) - activesupport (= 6.0.3.5) - activerecord (6.0.3.5) - activemodel (= 6.0.3.5) - activesupport (= 6.0.3.5) - activesupport (6.0.3.5) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - chartkick (3.4.0) - concurrent-ruby (1.1.8) - ffi (1.12.2) - httparty (0.18.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + chartkick (4.0.5) + concurrent-ruby (1.1.9) + ffi (1.15.4) + httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) - listen (3.2.1) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2021.0901) minitest (5.14.4) multi_xml (0.6.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) + nio4r (2.5.8) + puma (5.5.0) + nio4r (~> 2.0) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rerun (0.13.0) + rerun (0.13.1) listen (~> 3.0) - ruby2_keywords (0.0.2) - sinatra (2.0.8.1) + ruby2_keywords (0.0.5) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) - sinatra-activerecord (2.0.18) + sinatra-activerecord (2.0.23) activerecord (>= 4.1) sinatra (>= 1.0) speedtest (0.2.3) httparty (~> 0.13) sqlite3 (1.4.2) - thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) zeitwerk (2.4.2) PLATFORMS @@ -63,6 +65,7 @@ PLATFORMS DEPENDENCIES activerecord chartkick + puma rake rerun sinatra