From 5c8e349bc56149ba4dddbe8fc1b736de6d488fb4 Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Fri, 19 Apr 2024 09:30:35 -0400 Subject: [PATCH] cleanup alpine changes --- README.md | 2 +- Rakefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f82a880..a01b027 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ different contents. If both are specified, `--force` takes precedence. ### Runtime Optimizations: -* `--alpine` - use [alpine](https://www.alpinelinux.org/) as base image +* `--alpine` - use [alpine](https://www.alpinelinux.org/) as base image (requires [Alpine <= 3.18 OR Rails >= 8.0](https://github.com/sparklemotion/sqlite3-ruby/issues/434)) * `--fullstaq` - use [fullstaq](https://fullstaqruby.org/) [images](https://github.com/evilmartians/fullstaq-ruby-docker) on [quay.io](https://quay.io/repository/evl.ms/fullstaq-ruby?tab=tags&tag=latest) * `--jemalloc` - use [jemalloc](https://jemalloc.net/) memory allocator * `--swap=n` - allocate swap space. See [falloc options](https://man7.org/linux/man-pages/man1/fallocate.1.html#OPTIONS) for suffixes diff --git a/Rakefile b/Rakefile index 00b581c..8f1f45b 100644 --- a/Rakefile +++ b/Rakefile @@ -30,7 +30,7 @@ namespace :test do sh "bundle config set --local local.dockerfile-rails #{__dir__}" sh "bundle add dockerfile-rails --group development " + "--git https://github.com/rubys/dockerfile-rails.git" - sh "bin/rails generate dockerfile" + sh "bin/rails generate dockerfile --force" cp "#{__dir__}/test/docker-entrypoint", "bin" IO.write "config/routes.rb", 'Rails.application.routes.draw {get "/up", to: proc {[200, {}, ["ok"]]}}' @@ -51,7 +51,7 @@ namespace :test do sh "bundle config set --local local.dockerfile-rails #{__dir__}" sh "bundle add dockerfile-rails --group development " + "--git https://github.com/rubys/dockerfile-rails.git" - sh "bin/rails generate dockerfile --alpine" + sh "bin/rails generate dockerfile --alpine --force" cp "#{__dir__}/test/docker-entrypoint", "bin" IO.write "config/routes.rb", 'Rails.application.routes.draw {get "/up", to: proc {[200, {}, ["ok"]]}}'