From ddb140f3877007249b8bac30dda575e56a1586f9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 2 Mar 2022 19:12:22 +0000 Subject: [PATCH] Switch to using vips for image processing --- .github/workflows/tests.yml | 2 +- Dockerfile | 1 + INSTALL.md | 4 ++-- config/initializers/new_framework_defaults_7_0.rb | 2 +- script/vagrant/setup/provision.sh | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 65ebe5c2d..d4a721ff6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,7 @@ jobs: - name: Install packages run: | sudo apt-get -yqq update - sudo apt-get -yqq install memcached + sudo apt-get -yqq install memcached libvips-dev - name: Install gems run: | gem install bundler diff --git a/Dockerfile b/Dockerfile index 40ad730cd..eb4c26fd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN apt-get update \ libmagickwand-dev \ libpq-dev \ libsasl2-dev \ + libvips-dev \ libxml2-dev \ libxslt1-dev \ locales \ diff --git a/INSTALL.md b/INSTALL.md index 68b0d120e..451fe9795 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,7 +33,7 @@ These can be installed on Ubuntu 20.04 or later with: ``` sudo apt-get update sudo apt-get install ruby2.7 libruby2.7 ruby2.7-dev \ - libmagickwand-dev libxml2-dev libxslt1-dev nodejs \ + libvips-dev libmagickwand-dev libxml2-dev libxslt1-dev nodejs \ apache2 apache2-dev build-essential git-core firefox-geckodriver \ postgresql postgresql-contrib libpq-dev libsasl2-dev \ imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg @@ -52,7 +52,7 @@ sudo dnf install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ gcc gcc-c++ git \ postgresql postgresql-server postgresql-contrib libpq-devel \ perl-podlators ImageMagick libffi-devel gd-devel libarchive-devel \ - bzip2-devel nodejs-yarn + bzip2-devel nodejs-yarn vips-devel ``` If you didn't already have PostgreSQL installed then create a PostgreSQL instance and start the server: diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb index e41b6c7d1..79a3a2cf0 100644 --- a/config/initializers/new_framework_defaults_7_0.rb +++ b/config/initializers/new_framework_defaults_7_0.rb @@ -80,7 +80,7 @@ Rails.application.config.action_controller.raise_on_open_redirects = true # generate variants to use image processing macros and ruby-vips # operations. See the upgrading guide for detail on the changes required. # The `:mini_magick` option is not deprecated; it's fine to keep using it. -# Rails.application.config.active_storage.variant_processor = :vips +Rails.application.config.active_storage.variant_processor = :vips # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer # was `:marshal`. Convert all cookies to JSON, using the `:hybrid` formatter. diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index 6d7e51d6a..1abcba43d 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -19,7 +19,7 @@ apt-get upgrade -y apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \ libmagickwand-dev libxml2-dev libxslt1-dev nodejs yarnpkg \ apache2 apache2-dev build-essential git-core firefox-geckodriver \ - postgresql postgresql-contrib libpq-dev \ + postgresql postgresql-contrib libpq-dev libvips-dev \ libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev gem2.7 install rake gem2.7 install --version "~> 2.1.4" bundler -- 2.39.5