From cecc525a197f2fd35e0cc8b1bf924a23c4f85b03 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 20 Oct 2023 11:43:09 -0700 Subject: [PATCH] Use PR of zlib to try to reduce memory usage --- Dockerfile | 3 ++- Gemfile | 1 + Gemfile.lock | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 79d07e43c5d..dbe8daa3831 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,8 @@ RUN \ build-base \ linux-headers \ zlib-dev \ - tzdata + tzdata \ + git WORKDIR /app diff --git a/Gemfile b/Gemfile index 087696053ed..e4b8b8a6f84 100644 --- a/Gemfile +++ b/Gemfile @@ -53,6 +53,7 @@ gem "browser", "~> 5.3", ">= 5.3.1" gem "bcrypt", "~> 3.1", ">= 3.1.18" gem "maintenance_tasks", "~> 2.1" gem "strong_migrations", "~> 1.6" +gem "zlib", github: "ruby/zlib", ref: "refs/pull/61/head" # Admin dashboard gem "avo", "~> 2.42" diff --git a/Gemfile.lock b/Gemfile.lock index 552d5a82c85..923ff80bd86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/ruby/zlib.git + revision: dac893add59e0c48870e21c35494f02dfc7fda57 + ref: refs/pull/61/head + specs: + zlib (3.0.0) + GEM remote: https://rubygems.org/ specs: @@ -790,6 +797,7 @@ DEPENDENCIES webauthn (~> 3.0) webmock (~> 3.18) xml-simple (~> 1.1) + zlib! BUNDLED WITH 2.4.20