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

Jump to bottom

CHECK-2355 Remove platform dependencies for X86 #283

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

CHECK-2355 Remove platform dependencies for X86 #283

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
a64f217
Upgrade nokogiri for ARM support
huslage Sep 2, 2022
2a6ae2b
Remove from the container
huslage Sep 2, 2022
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends curl build-

WORKDIR /app

COPY Gemfile* ./
RUN gem install nokogiri -v 1.12.5
RUN bundle config set specific_platform true && bundle install
COPY Gemfile ./
RUN bundle install
COPY . .
RUN rm Gemfile.lock

ENTRYPOINT ["/usr/bin/dumb-init", "--", "make"]
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gem('activesupport', '6.0.3.1')
gem('addressable', '2.8.0')
gem('airbrake', '~> 5.0')
gem('aws-sdk-s3', '~> 1')
gem('cld')
gem 'cld', '~> 0.11.0'
gem('connection_pool', '2.2.2')
gem('dgaff')
gem('diff-lcs', '1.3')
Expand Down
11 changes: 4 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ GEM
brpoplpush-redis_script (0.1.2)
concurrent-ruby (~> 1.0, >= 1.0.5)
redis (>= 1.0, <= 5.0)
cld (0.10.0)
cld (0.11.0)
ffi
coderay (1.1.3)
concurrent-ruby (1.1.9)
Expand Down Expand Up @@ -131,10 +131,7 @@ GEM
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
netrc (0.11.0)
nokogiri (1.13.4)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.4-x86_64-linux)
nokogiri (1.13.4-aarch64-linux)
racc (~> 1.4)
parallel (1.19.1)
parser (3.0.3.2)
Expand Down Expand Up @@ -238,15 +235,15 @@ GEM
zeitwerk (2.3.0)

PLATFORMS
aarch64-linux
ruby
x86_64-linux

DEPENDENCIES
activesupport (= 6.0.3.1)
addressable (= 2.8.0)
airbrake (~> 5.0)
aws-sdk-s3 (~> 1)
cld
cld (~> 0.11.0)
connection_pool (= 2.2.2)
dgaff
diff-lcs (= 1.3)
Expand Down