use thrust binstub if available

Author: rubys

lib/generators/dockerfile_generator.rb

@@ -333,7 +333,7 @@ def generate_app
 
     if fix_database_config
       template "database.yml.erb", "config/database.yml",
-        force: File.exist?("fly.toml")
+        force: options.force? || File.exist?("fly.toml")
     end
 
     if solidq_launcher == :puma && !File.read("config/puma.rb").include?(":solid_queue")
@@ -1249,9 +1249,15 @@ def procfile
         rails: "./bin/rails server -p 3001"
       }
     elsif using_thruster?
-      base = {
-        rails: "bundle exec thrust ./bin/rails server"
-      }
+      if File.exist? "bin/thrust"
+        base = {
+          rails: "./bin/thrust ./bin/rails server"
+        }
+      else
+        base = {
+          rails: "bundle exec thrust ./bin/rails server"
+        }
+      end
     else
       base = {
         rails: "./bin/rails server"

test/results/alpine/Dockerfile

@@ -83,4 +83,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/alpine/docker-entrypoint

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # If running the rails server then create or migrate existing database
-if [ "${*}" == "bundle exec thrust ./bin/rails server" ]; then
+if [ "${*}" == "./bin/thrust ./bin/rails server" ]; then
   ./bin/rails db:prepare
 fi
 

test/results/api/Dockerfile

@@ -88,4 +88,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/bin_cd/Dockerfile

@@ -68,4 +68,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/bun/Dockerfile

@@ -81,4 +81,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/cache/Dockerfile

@@ -92,4 +92,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/ci/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/config/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/env/Dockerfile

@@ -69,4 +69,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/esbuild/Dockerfile

@@ -84,4 +84,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/execjs_importmap/Dockerfile

@@ -84,4 +84,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/execjs_node/Dockerfile

@@ -92,4 +92,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/fullstaq/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/grover/Dockerfile

@@ -87,4 +87,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/jemalloc/Dockerfile

@@ -67,4 +67,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/label/Dockerfile

@@ -67,4 +67,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/litefs/docker-entrypoint

@@ -4,7 +4,7 @@
 sudo -E litefs mount &
 
 # If running the rails server then create or migrate existing database
-if [ "${*}" == "bundle exec thrust ./bin/rails server" -a "$FLY_REGION" == "$PRIMARY_REGION" ]; then
+if [ "${*}" == "./bin/thrust ./bin/rails server" -a "$FLY_REGION" == "$PRIMARY_REGION" ]; then
   ./bin/rails db:prepare
 fi
 

test/results/minimal/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/mysql/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/no_precompiled_gems/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/no_prep/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/parallel/Dockerfile

@@ -93,4 +93,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/postgresql/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/precompile_defer/Dockerfile

@@ -53,4 +53,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/precompile_defer/docker-entrypoint

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # If running the rails server then create or migrate existing database
-if [ "${*}" == "bundle exec thrust ./bin/rails server" ]; then
+if [ "${*}" == "./bin/thrust ./bin/rails server" ]; then
   ./bin/rails assets:precompile
   ./bin/rails db:prepare
 fi

test/results/private_gemserver/Dockerfile

@@ -70,4 +70,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/private_gemserver_with_cache/Dockerfile

@@ -79,4 +79,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/redis/Dockerfile

@@ -71,4 +71,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/rmagick/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/shrine/Dockerfile

@@ -65,4 +65,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/sidekiq/fly.toml

@@ -1,5 +1,5 @@
 
 [processes]
-  app = "bundle exec thrust ./bin/rails server"
+  app = "./bin/thrust ./bin/rails server"
   sidekiq = "bundle exec sidekiq"
 

test/results/solid_queue_postgres/fly.toml

@@ -1,5 +1,5 @@
 
 [processes]
-  app = "bundle exec thrust ./bin/rails server"
+  app = "./bin/thrust ./bin/rails server"
   solidq = "bundle exec rake solid_queue:start"
 

test/results/solid_queue_sqlite3/Dockerfile

@@ -70,4 +70,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/sqlite3/Dockerfile

@@ -71,4 +71,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/swap/Dockerfile

@@ -64,4 +64,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/swap/docker-entrypoint

@@ -13,7 +13,7 @@ if [ $UID -eq 0 ]; then
 fi
 
 # If running the rails server then create or migrate existing database
-if [ "${*}" == "bundle exec thrust ./bin/rails server" ]; then
+if [ "${*}" == "./bin/thrust ./bin/rails server" ]; then
   ./bin/rails db:prepare
 fi
 

test/results/thruster/Dockerfile

@@ -69,4 +69,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/trilogy/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/vite/Dockerfile

@@ -76,4 +76,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/windows/Dockerfile

@@ -69,4 +69,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]

test/results/yjit/Dockerfile

@@ -66,4 +66,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80
 VOLUME /data
-CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
+CMD ["./bin/thrust", "./bin/rails", "server"]