diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 935bbf25ae..ab6e4a523a 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -41,7 +41,7 @@ jobs: with: bundler-cache: true - name: Install dependencies - run: yarn install + run: yarn install && sudo apt-get install libvips42 # Add or replace test runners here - name: Start containers run: cp .env.test.ci .env.test && cp .env.test .env && cp docker-compose.ci.yml docker-compose.override.yml && docker-compose up -d solr tika diff --git a/Dockerfile b/Dockerfile index 1a61ffeae2..4e0664a4ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ RUN mkdir -p /etc/apt/keyrings && \ curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarnkey.gpg && \ echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ echo "deb [signed-by=/etc/apt/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update -qq && apt-get install -y nodejs yarn postgresql-client imagemagick poppler-utils ffmpeg && apt-get clean && rm -rf /var/lib/apt/lists/* + apt-get update -qq && apt-get install -y nodejs yarn postgresql-client imagemagick poppler-utils ffmpeg libvips42 && \ + apt-get clean && rm -rf /var/lib/apt/lists/* RUN mkdir /enju && chown -R enju:enju /enju USER enju WORKDIR /enju diff --git a/config/application.rb b/config/application.rb index 4a22c42928..8454411cb2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,7 +14,7 @@ module EnjuLeaf class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.1 + config.load_defaults 7.0 # Configuration for the application, engines, and railties goes here. #