diff --git a/.dockerdev/Dockerfile b/.dockerdev/Dockerfile index 1f60d0c09b6..b733cc1e905 100644 --- a/.dockerdev/Dockerfile +++ b/.dockerdev/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update -qq \ curl \ git \ imagemagick \ + libvips \ libmariadb-dev \ sqlite3 \ libsqlite3-dev \ diff --git a/core/app/models/concerns/spree/active_storage_adapter/attachment.rb b/core/app/models/concerns/spree/active_storage_adapter/attachment.rb index d78587cea70..d37d55b9e23 100644 --- a/core/app/models/concerns/spree/active_storage_adapter/attachment.rb +++ b/core/app/models/concerns/spree/active_storage_adapter/attachment.rb @@ -30,7 +30,9 @@ def variant(style = nil) size = style_to_size(style) @attachment.variant( resize_to_limit: size, - strip: true + saver: { + strip: true + } ).processed end @@ -58,7 +60,7 @@ def metadata end def normalize_styles(styles) - styles.transform_values { |v| v.split('x') } + styles.transform_values { |v| v.split('x').map(&:to_i) } end def style_to_size(style) diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb index 8bccfa63ac8..247c638859e 100644 --- a/core/lib/spree/testing_support/dummy_app.rb +++ b/core/lib/spree/testing_support/dummy_app.rb @@ -96,6 +96,7 @@ class Application < ::Rails::Application } } config.active_storage.service = :test + config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :mini_magick).to_sym end end diff --git a/docker-compose.yml b/docker-compose.yml index 7e5d771fc07..cdbe4ff35aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,6 +40,7 @@ services: HISTFILE: "/home/solidus_user/history/bash_history" MYSQL_HISTFILE: "/home/solidus_user/history/mysql_history" RAILS_ENV: development + ACTIVE_STORAGE_VARIANT_PROCESSOR: "mini_magick" ports: - "${SANDBOX_PORT:-3000}:${SANDBOX_PORT:-3000}" volumes: