Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker build errors #1819

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Fix docker build errors #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6143ac
upgrade gems
apoorv1316 Apr 24, 2024
3a5c2a3
Merge branch 'develop' into upgrade-gems-to-fix-docker-build
apoorv1316 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
gem "pundit", "~> 2.2"

# Data migration gem to migrate data alongside schema changes
gem "data_migrate", "~> 8.0.0.rc2"
gem "data_migrate"

# pagy for Pagination
gem "pagy", "~> 5.10"
Expand Down Expand Up @@ -235,3 +235,5 @@ gem "rack-cors", "2.0.0"

# Administrate dashboard
gem "administrate"

gem "psych", "~> 4"
45 changes: 23 additions & 22 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
base64 (0.1.1)
base64 (0.2.0)
bcrypt (3.1.18)
better_html (2.0.1)
actionview (>= 6.0)
Expand All @@ -151,7 +151,7 @@ GEM
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (3.1.4)
bigdecimal (3.1.7)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
Expand Down Expand Up @@ -181,9 +181,9 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
data_migrate (8.0.0)
activerecord (>= 5.0)
railties (>= 5.0)
data_migrate (9.3.0)
activerecord (>= 6.1)
railties (>= 6.1)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
Expand Down Expand Up @@ -212,8 +212,7 @@ GEM
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
drb (2.1.1)
ruby2_keywords
drb (2.2.1)
elasticsearch (7.13.3)
elasticsearch-api (= 7.13.3)
elasticsearch-transport (= 7.13.3)
Expand Down Expand Up @@ -301,12 +300,12 @@ GEM
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.6.0)
io-console (0.7.2)
irb (1.12.0)
rdoc
reline (>= 0.4.2)
Expand Down Expand Up @@ -341,7 +340,7 @@ GEM
letter_opener (~> 1.7)
railties (>= 5.2)
rexml
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -354,14 +353,14 @@ GEM
memoist (0.16.2)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.20.0)
minitest (5.22.3)
money (6.16.0)
i18n (>= 0.6.4, <= 2)
msgpack (1.6.0)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
mutex_m (0.1.2)
mutex_m (0.2.0)
net-imap (0.3.4)
date
net-protocol
Expand All @@ -373,11 +372,11 @@ GEM
net-protocol
newrelic_rpm (9.8.0)
nio4r (2.5.9)
nokogiri (1.16.2-arm64-darwin)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-darwin)
nokogiri (1.16.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
nokogiri (1.16.4-x86_64-linux)
racc (~> 1.4)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
Expand Down Expand Up @@ -411,7 +410,7 @@ GEM
parser (3.2.0.0)
ast (~> 2.4.1)
pg (1.4.5)
psych (5.1.2)
psych (4.0.6)
stringio
public_suffix (5.0.4)
puma (6.4.2)
Expand Down Expand Up @@ -470,7 +469,7 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.0.6)
rake (13.2.1)
ransack (4.1.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
Expand All @@ -487,7 +486,7 @@ GEM
redis-client (0.22.1)
connection_pool
regexp_parser (2.9.0)
reline (0.5.0)
reline (0.5.3)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down Expand Up @@ -625,9 +624,9 @@ GEM
stripe (8.2.0)
strong_migrations (1.4.2)
activerecord (>= 5.2)
thor (1.2.2)
thor (1.3.1)
tilt (2.0.11)
timeout (0.4.0)
timeout (0.4.1)
trailblazer-option (0.1.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -655,11 +654,12 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.12)
zeitwerk (2.6.13)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-darwin-21
x86_64-darwin-22
x86_64-linux
Expand All @@ -676,7 +676,7 @@ DEPENDENCIES
bundler-audit
capybara (>= 3.26)
countries
data_migrate (~> 8.0.0.rc2)
data_migrate
database_cleaner (~> 2.0)
debug (>= 1.0.0)
devise
Expand Down Expand Up @@ -704,6 +704,7 @@ DEPENDENCIES
pagy (~> 5.10)
parallel_tests
pg
psych (~> 4)
puma (~> 6.4.2)
pundit (~> 2.2)
rack-cors (= 2.0.0)
Expand Down
Loading