Skip to content

Commit

Permalink
Merge pull request #26 from matestack/issue-25/npm-install-failing-on…
Browse files Browse the repository at this point in the history
…-m1-mac

Fix dummy app's `npm install` failing on M1 Macs
  • Loading branch information
aaron-contreras authored Apr 19, 2023
2 parents e07691c + 7d2568b commit 6e3e306
Show file tree
Hide file tree
Showing 6 changed files with 8,677 additions and 18,401 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ruby:3.0-alpine3.12
RUN gem install bundler:2.1.4

RUN apk update --no-cache && \
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm shared-mime-info && \
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm shared-mime-info gcompat && \
mkdir -p /app

WORKDIR /app
Expand Down
15 changes: 9 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PATH
remote: .
specs:
matestack-ui-bootstrap (3.0.0.rc1)
matestack-ui-core (~> 3.0.0.rc2)
matestack-ui-vuejs (~> 3.0.0.rc2)
matestack-ui-bootstrap (3.1.2)
matestack-ui-core (~> 3.0.0)
matestack-ui-vuejs (~> 3.1.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -122,9 +122,9 @@ GEM
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.2)
matestack-ui-core (3.0.0.rc2)
matestack-ui-core (3.0.1)
rails (>= 5.2)
matestack-ui-vuejs (3.0.0.rc2)
matestack-ui-vuejs (3.1.0)
matestack-ui-core (~> 3.0.0.rc1)
rails (>= 5.2)
matrix (0.4.2)
Expand All @@ -148,6 +148,8 @@ GEM
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.1-aarch64-linux)
racc (~> 1.4)
nokogiri (1.13.1-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand Down Expand Up @@ -277,6 +279,7 @@ GEM
zeitwerk (2.5.4)

PLATFORMS
aarch64-linux-musl
x86_64-linux-musl

DEPENDENCIES
Expand Down Expand Up @@ -306,4 +309,4 @@ DEPENDENCIES
webpacker (~> 5.0)

BUNDLED WITH
2.2.3
2.2.33
Loading

0 comments on commit 6e3e306

Please sign in to comment.