diff --git a/meta_request/Dockerfile-rails-7.0 b/meta_request/Dockerfile-rails-7.0 index 864d42a..ea2589c 100644 --- a/meta_request/Dockerfile-rails-7.0 +++ b/meta_request/Dockerfile-rails-7.0 @@ -1,23 +1,25 @@ -FROM ruby:3.0-alpine +FROM ruby:3.0 -RUN apk add --update --no-cache \ - build-base \ - curl-dev \ +RUN apt-get update && \ + apt-get install --yes --no-install-recommends \ + libcurl4-openssl-dev \ git \ nodejs \ + npm \ shared-mime-info \ - sqlite-dev \ + libsqlite3-dev \ tzdata \ - yaml-dev \ - yarn \ - zlib-dev + libyaml-dev \ + yarnpkg \ + zlib1g-dev &&\ + apt-get clean RUN mkdir /app /gem WORKDIR /app -RUN gem update --system -RUN gem install rails -v 7.0.4 -RUN rails new . +RUN gem update --system && \ + gem install rails -v 7.0.4 && | + rails new . COPY . /gem RUN bundle add meta_request --path /gem diff --git a/meta_request/Dockerfile-rails-7.1 b/meta_request/Dockerfile-rails-7.1 new file mode 100644 index 0000000..10a1fe1 --- /dev/null +++ b/meta_request/Dockerfile-rails-7.1 @@ -0,0 +1,37 @@ +FROM ruby:3.2 + +RUN apt-get update && \ + apt-get install --yes --no-install-recommends \ + libcurl4-openssl-dev \ + git \ + nodejs \ + npm \ + shared-mime-info \ + libsqlite3-dev \ + tzdata \ + libyaml-dev \ + yarnpkg \ + zlib1g-dev &&\ + apt-get clean + +RUN mkdir /app /gem +WORKDIR /app + +RUN gem update --system && \ + gem install rails -v 7.1.1 && | + rails new . + +COPY . /gem +RUN bundle add meta_request --path /gem +RUN bundle install + +COPY res/routes.rb /app/config/ +COPY res/dummy_controller.rb /app/app/controllers/ +COPY res/dummy /app/app/views/dummy +COPY res/meta_request_test.rb /app/test/integration/ + +RUN bundle exec rails db:migrate + +ENV PARALLEL_WORKERS 1 + +CMD ["bin/rake"] diff --git a/meta_request/docker-compose.yml b/meta_request/docker-compose.yml index 0000881..ebdbe9d 100644 --- a/meta_request/docker-compose.yml +++ b/meta_request/docker-compose.yml @@ -21,3 +21,7 @@ services: build: context: . dockerfile: Dockerfile-rails-7.0 + test-rails-7.1: + build: + context: . + dockerfile: Dockerfile-rails-7.1 diff --git a/meta_request/meta_request.gemspec b/meta_request/meta_request.gemspec index 24ba44c..735c4d7 100644 --- a/meta_request/meta_request.gemspec +++ b/meta_request/meta_request.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |gem| gem.license = 'MIT' gem.add_dependency 'rack-contrib', '>= 1.1', '< 3' - gem.add_dependency 'railties', '>= 3.0.0', '< 7.1' + gem.add_dependency 'railties', '>= 3.0.0', '< 7.2' gem.add_development_dependency 'rspec', '~> 3.8.0' gem.add_development_dependency 'rubocop', '~> 0.74.0'