From a64f217c33594f18cddc186d1b0681918bab62c2 Mon Sep 17 00:00:00 2001 From: Aaron Huslage Date: Fri, 2 Sep 2022 11:23:09 -0400 Subject: [PATCH 1/2] Upgrade nokogiri for ARM support --- Dockerfile | 1 - Gemfile | 2 +- Gemfile.lock | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 07562b1d..5dd72796 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ 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 . . diff --git a/Gemfile b/Gemfile index b5420731..c0d00871 100644 --- a/Gemfile +++ b/Gemfile @@ -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') diff --git a/Gemfile.lock b/Gemfile.lock index e4b67acc..f8d628d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -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) From 2a6ae2b7b24672e00989b688e543b75f2fb9e0c2 Mon Sep 17 00:00:00 2001 From: Aaron Huslage Date: Fri, 2 Sep 2022 14:19:55 -0400 Subject: [PATCH 2/2] Remove from the container --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5dd72796..0fd06ef7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,9 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends curl build- WORKDIR /app -COPY Gemfile* ./ -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"]