Update rails + docker fixes
This commit is contained in:
parent
0cec39413f
commit
efdd42b492
5 changed files with 111 additions and 94 deletions
2
Gemfile
2
Gemfile
|
|
@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
||||||
ruby '2.7.2'
|
ruby '2.7.2'
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
|
||||||
gem 'rails', '~> 6.1.3'
|
gem 'rails', '~> 6.1.7.6'
|
||||||
# Use sqlite3 as the database for Active Record
|
# Use sqlite3 as the database for Active Record
|
||||||
gem 'sqlite3', '~> 1.4'
|
gem 'sqlite3', '~> 1.4'
|
||||||
# Use Puma as the app server
|
# Use Puma as the app server
|
||||||
|
|
|
||||||
198
Gemfile.lock
198
Gemfile.lock
|
|
@ -1,60 +1,60 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (6.1.3)
|
actioncable (6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (6.1.3)
|
actionmailbox (6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
activejob (= 6.1.3)
|
activejob (= 6.1.7.6)
|
||||||
activerecord (= 6.1.3)
|
activerecord (= 6.1.7.6)
|
||||||
activestorage (= 6.1.3)
|
activestorage (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
actionmailer (6.1.3)
|
actionmailer (6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
actionview (= 6.1.3)
|
actionview (= 6.1.7.6)
|
||||||
activejob (= 6.1.3)
|
activejob (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (6.1.3)
|
actionpack (6.1.7.6)
|
||||||
actionview (= 6.1.3)
|
actionview (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
rack (~> 2.0, >= 2.0.9)
|
rack (~> 2.0, >= 2.0.9)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actiontext (6.1.3)
|
actiontext (6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
activerecord (= 6.1.3)
|
activerecord (= 6.1.7.6)
|
||||||
activestorage (= 6.1.3)
|
activestorage (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (6.1.3)
|
actionview (6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||||
activejob (6.1.3)
|
activejob (6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (6.1.3)
|
activemodel (6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
activerecord (6.1.3)
|
activerecord (6.1.7.6)
|
||||||
activemodel (= 6.1.3)
|
activemodel (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
activestorage (6.1.3)
|
activestorage (6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
activejob (= 6.1.3)
|
activejob (= 6.1.7.6)
|
||||||
activerecord (= 6.1.3)
|
activerecord (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 1.0)
|
||||||
mimemagic (~> 0.3.2)
|
mini_mime (>= 1.1.0)
|
||||||
activesupport (6.1.3)
|
activesupport (6.1.7.6)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 1.6, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
minitest (>= 5.1)
|
minitest (>= 5.1)
|
||||||
|
|
@ -78,77 +78,90 @@ GEM
|
||||||
regexp_parser (>= 1.5, < 3.0)
|
regexp_parser (>= 1.5, < 3.0)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
childprocess (3.0.0)
|
childprocess (3.0.0)
|
||||||
concurrent-ruby (1.1.8)
|
concurrent-ruby (1.2.2)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
erubi (1.10.0)
|
date (3.3.3)
|
||||||
|
erubi (1.12.0)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
ffi (1.15.0)
|
ffi (1.15.0)
|
||||||
globalid (0.4.2)
|
globalid (1.2.1)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 6.1)
|
||||||
i18n (1.8.9)
|
i18n (1.14.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
jbuilder (2.11.2)
|
jbuilder (2.11.2)
|
||||||
activesupport (>= 5.0.0)
|
activesupport (>= 5.0.0)
|
||||||
listen (3.4.1)
|
listen (3.4.1)
|
||||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||||
rb-inotify (~> 0.9, >= 0.9.10)
|
rb-inotify (~> 0.9, >= 0.9.10)
|
||||||
loofah (2.9.0)
|
loofah (2.21.3)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.12.0)
|
||||||
mail (2.7.1)
|
mail (2.8.1)
|
||||||
mini_mime (>= 0.1.1)
|
mini_mime (>= 0.1.1)
|
||||||
marcel (0.3.3)
|
net-imap
|
||||||
mimemagic (~> 0.3.2)
|
net-pop
|
||||||
|
net-smtp
|
||||||
|
marcel (1.0.2)
|
||||||
materialize-sass (1.0.0)
|
materialize-sass (1.0.0)
|
||||||
autoprefixer-rails (>= 6.0.3)
|
autoprefixer-rails (>= 6.0.3)
|
||||||
method_source (1.0.0)
|
method_source (1.0.0)
|
||||||
mimemagic (0.3.5)
|
mini_mime (1.1.5)
|
||||||
mini_mime (1.0.2)
|
mini_portile2 (2.8.4)
|
||||||
mini_portile2 (2.5.0)
|
minitest (5.20.0)
|
||||||
minitest (5.14.4)
|
|
||||||
msgpack (1.4.2)
|
msgpack (1.4.2)
|
||||||
nio4r (2.5.7)
|
net-imap (0.3.7)
|
||||||
nokogiri (1.11.2)
|
date
|
||||||
mini_portile2 (~> 2.5.0)
|
net-protocol
|
||||||
|
net-pop (0.1.2)
|
||||||
|
net-protocol
|
||||||
|
net-protocol (0.2.1)
|
||||||
|
timeout
|
||||||
|
net-smtp (0.4.0)
|
||||||
|
net-protocol
|
||||||
|
nio4r (2.5.9)
|
||||||
|
nokogiri (1.15.4)
|
||||||
|
mini_portile2 (~> 2.8.2)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
public_suffix (4.0.6)
|
public_suffix (4.0.6)
|
||||||
puma (5.2.2)
|
puma (5.2.2)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
racc (1.5.2)
|
racc (1.7.1)
|
||||||
rack (2.2.3)
|
rack (2.2.8)
|
||||||
rack-mini-profiler (2.3.1)
|
rack-mini-profiler (2.3.1)
|
||||||
rack (>= 1.2.0)
|
rack (>= 1.2.0)
|
||||||
rack-proxy (0.6.5)
|
rack-proxy (0.6.5)
|
||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (2.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.3)
|
||||||
rails (6.1.3)
|
rails (6.1.7.6)
|
||||||
actioncable (= 6.1.3)
|
actioncable (= 6.1.7.6)
|
||||||
actionmailbox (= 6.1.3)
|
actionmailbox (= 6.1.7.6)
|
||||||
actionmailer (= 6.1.3)
|
actionmailer (= 6.1.7.6)
|
||||||
actionpack (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
actiontext (= 6.1.3)
|
actiontext (= 6.1.7.6)
|
||||||
actionview (= 6.1.3)
|
actionview (= 6.1.7.6)
|
||||||
activejob (= 6.1.3)
|
activejob (= 6.1.7.6)
|
||||||
activemodel (= 6.1.3)
|
activemodel (= 6.1.7.6)
|
||||||
activerecord (= 6.1.3)
|
activerecord (= 6.1.7.6)
|
||||||
activestorage (= 6.1.3)
|
activestorage (= 6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
activesupport (= 6.1.7.6)
|
||||||
bundler (>= 1.15.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 6.1.3)
|
railties (= 6.1.7.6)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.2.0)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 5.0.0)
|
||||||
|
minitest
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.3.0)
|
rails-html-sanitizer (1.6.0)
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.21)
|
||||||
railties (6.1.3)
|
nokogiri (~> 1.14)
|
||||||
actionpack (= 6.1.3)
|
railties (6.1.7.6)
|
||||||
activesupport (= 6.1.3)
|
actionpack (= 6.1.7.6)
|
||||||
|
activesupport (= 6.1.7.6)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 12.2)
|
||||||
thor (~> 1.0)
|
thor (~> 1.0)
|
||||||
rake (13.0.3)
|
rake (13.0.6)
|
||||||
rb-fsevent (0.10.4)
|
rb-fsevent (0.10.4)
|
||||||
rb-inotify (0.10.1)
|
rb-inotify (0.10.1)
|
||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
|
|
@ -169,20 +182,21 @@ GEM
|
||||||
rubyzip (>= 1.2.2)
|
rubyzip (>= 1.2.2)
|
||||||
semantic_range (3.0.0)
|
semantic_range (3.0.0)
|
||||||
spring (2.1.1)
|
spring (2.1.1)
|
||||||
sprockets (4.0.2)
|
sprockets (4.2.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (>= 2.2.4, < 4)
|
||||||
sprockets-rails (3.2.2)
|
sprockets-rails (3.4.2)
|
||||||
actionpack (>= 4.0)
|
actionpack (>= 5.2)
|
||||||
activesupport (>= 4.0)
|
activesupport (>= 5.2)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (1.4.2)
|
sqlite3 (1.4.2)
|
||||||
thor (1.1.0)
|
thor (1.2.2)
|
||||||
tilt (2.0.10)
|
tilt (2.0.10)
|
||||||
|
timeout (0.4.0)
|
||||||
turbolinks (5.2.1)
|
turbolinks (5.2.1)
|
||||||
turbolinks-source (~> 5.2)
|
turbolinks-source (~> 5.2)
|
||||||
turbolinks-source (5.2.0)
|
turbolinks-source (5.2.0)
|
||||||
tzinfo (2.0.4)
|
tzinfo (2.0.6)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
web-console (4.1.0)
|
web-console (4.1.0)
|
||||||
actionview (>= 6.0.0)
|
actionview (>= 6.0.0)
|
||||||
|
|
@ -198,12 +212,12 @@ GEM
|
||||||
rack-proxy (>= 0.6.1)
|
rack-proxy (>= 0.6.1)
|
||||||
railties (>= 5.2)
|
railties (>= 5.2)
|
||||||
semantic_range (>= 2.3.0)
|
semantic_range (>= 2.3.0)
|
||||||
websocket-driver (0.7.3)
|
websocket-driver (0.7.6)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.5)
|
websocket-extensions (0.1.5)
|
||||||
xpath (3.2.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
zeitwerk (2.4.2)
|
zeitwerk (2.6.12)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
@ -217,7 +231,7 @@ DEPENDENCIES
|
||||||
materialize-sass (~> 1.0.0)
|
materialize-sass (~> 1.0.0)
|
||||||
puma (~> 5.0)
|
puma (~> 5.0)
|
||||||
rack-mini-profiler (~> 2.0)
|
rack-mini-profiler (~> 2.0)
|
||||||
rails (~> 6.1.3)
|
rails (~> 6.1.7.6)
|
||||||
sass-rails (>= 6)
|
sass-rails (>= 6)
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
spring
|
spring
|
||||||
|
|
|
||||||
|
|
@ -73,4 +73,6 @@ Rails.application.configure do
|
||||||
|
|
||||||
# Uncomment if you wish to allow Action Cable access from any origin.
|
# Uncomment if you wish to allow Action Cable access from any origin.
|
||||||
# config.action_cable.disable_request_forgery_protection = true
|
# config.action_cable.disable_request_forgery_protection = true
|
||||||
|
#
|
||||||
|
config.web_console.permissions = '192.168.0.0/16'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ services:
|
||||||
env_file:
|
env_file:
|
||||||
- docker/.env
|
- docker/.env
|
||||||
webpack_dev_server:
|
webpack_dev_server:
|
||||||
image: bookstore_bookstore
|
image: bookstore-bookstore
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/app:delegated
|
- ./:/app:delegated
|
||||||
- bundle_volume:/usr/local/bundle
|
- bundle_volume:/usr/local/bundle
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
yarn install
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue