Switch to using vips for image processing

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 65ebe5c2d5b27a085baded6cd3db5a4fb4fb8cf5..d4a721ff65ff0c523df1b8a59190244ffe0a769d 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt-get -yqq update
     - 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
     - name: Install gems
       run: |
         gem install bundler

diff --git a/Dockerfile b/Dockerfile
index 40ad730cd77f0e9b6c14706e77e568fe15212a3e..eb4c26fd118429d3d8cd9e66cc56a3c4c81ff467 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update \
       libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
       libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \

+      libvips-dev \

       libxml2-dev \
       libxslt1-dev \
       locales \
       libxml2-dev \
       libxslt1-dev \
       locales \

diff --git a/INSTALL.md b/INSTALL.md
index 68b0d120eed37af098e356d3b4b08fe8fa8cfa6e..451fe97952f16676a6d0b93b625bc56724c0bd66 100644 (file)
--- 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 \
 ```
 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
                      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 \
                  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:
 ```
 
 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 e41b6c7d1f759e06402392aa2a8e1cd725148544..79a3a2cf04ba148b2a6178e65cd78bc3b4bd469a 100644 (file)
--- 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.
 # 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.
 
 # 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 6d7e51d6a0527b91f697c2a52d0849b42c5482cc..1abcba43d54f6e892ed7fe2edb2c7d8918b67b99 100644 (file)
--- 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 \
 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
                      libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
 gem2.7 install rake
 gem2.7 install --version "~> 2.1.4" bundler