diff --git a/.dockerdev/Dockerfile b/.dockerdev/Dockerfile index b91016d9fb0..c365159754c 100644 --- a/.dockerdev/Dockerfile +++ b/.dockerdev/Dockerfile @@ -1,5 +1,5 @@ ARG RUBY_VERSION -FROM ruby:$RUBY_VERSION-slim-buster +FROM ruby:$RUBY_VERSION-slim-bookworm ARG PG_VERSION ARG MYSQL_VERSION @@ -14,6 +14,7 @@ RUN apt-get update -qq \ git \ imagemagick \ libvips \ + libffi-dev \ libmariadb-dev \ sqlite3 \ libsqlite3-dev \ @@ -22,10 +23,10 @@ RUN apt-get update -qq \ && rm -rf /var/cache/apt/lists/* RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' $PG_VERSION > /etc/apt/sources.list.d/pgdg.list + && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' $PG_VERSION > /etc/apt/sources.list.d/pgdg.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467b942d3a79bd29 \ - && echo "deb http://repo.mysql.com/apt/debian/ buster mysql-"$MYSQL_VERSION > /etc/apt/sources.list.d/mysql.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C \ + && echo "deb http://repo.mysql.com/apt/debian/ bookworm mysql-"$MYSQL_VERSION > /etc/apt/sources.list.d/mysql.list RUN curl -sSL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - diff --git a/Gemfile b/Gemfile index e22ffa36df0..0b9b891c0a8 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,6 @@ group :backend do gem 'capybara', '~> 3.13', require: false gem 'capybara-screenshot', '>= 1.0.18', require: false gem 'selenium-webdriver', require: false - gem 'webdrivers', require: false # JavaScript testing gem 'teaspoon', require: false diff --git a/admin/spec/spec_helper.rb b/admin/spec/spec_helper.rb index a68db70acc9..8661c296e3a 100644 --- a/admin/spec/spec_helper.rb +++ b/admin/spec/spec_helper.rb @@ -44,7 +44,6 @@ require "capybara/rspec" require 'capybara-screenshot/rspec' require "selenium/webdriver" -require 'webdrivers' Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS'] Capybara.exact = true Capybara.disable_animation = true diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rb index 8e8efa43802..ccbf8761aa4 100644 --- a/backend/spec/spec_helper.rb +++ b/backend/spec/spec_helper.rb @@ -52,7 +52,6 @@ Capybara.exact = true require "selenium/webdriver" -require 'webdrivers' Capybara.register_driver :selenium_chrome_headless do |app| browser_options = ::Selenium::WebDriver::Chrome::Options.new diff --git a/backend/spec/teaspoon_env.rb b/backend/spec/teaspoon_env.rb index 9b36bc0e3fe..86f8b204256 100644 --- a/backend/spec/teaspoon_env.rb +++ b/backend/spec/teaspoon_env.rb @@ -13,7 +13,6 @@ ENV['RAILS_ENV'] = 'test' require 'teaspoon/driver/selenium' -require 'webdrivers' # Similar to setup described in # https://github.com/jejacks0n/teaspoon/wiki/Micro-Applications diff --git a/docker-compose.yml b/docker-compose.yml index 279c78b876d..a94ee665dc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - postgres:/var/lib/postgresql/data:cached app: + shm_size: '256mb' build: context: .dockerdev dockerfile: Dockerfile