diff --git a/Dockerfile b/Dockerfile index 5d9ea3f..6aebf17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,15 +47,15 @@ RUN RAILS_ENV=production bundle exec rake assets:clobber assets:precompile \ && chown -R webapp:webapp /home/webapp/ # Define volumes used by ECS to share public html and extra nginx config with nginx container -VOLUME /home/webapp/app/public -VOLUME /home/webapp/app/nginx-conf +# VOLUME /home/webapp/app/public +# VOLUME /home/webapp/app/nginx-conf # Run container process as non-root user USER webapp # Start server via Thruster by default, this can be overwritten at runtime -# EXPOSE 80 -# CMD ["./bin/thrust", "./bin/rails", "server"] +EXPOSE 80 +CMD ["./bin/thrust", "./bin/rails", "server"] # Command to start rails -CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"] +# CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"] diff --git a/Gemfile b/Gemfile index eae2733..1842d1b 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem "bootsnap", require: false # gem "kamal", require: false # Add HTTP asset caching/compression and X-Sendfile acceleration to Puma [https://github.com/basecamp/thruster/] -# gem "thruster", require: false +gem "thruster", require: false group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem diff --git a/Gemfile.lock b/Gemfile.lock index aef10eb..e867d0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,6 +461,11 @@ GEM rubocop-performance (~> 1.23.0) stringio (3.1.2) thor (1.3.2) + thruster (0.1.9) + thruster (0.1.9-aarch64-linux) + thruster (0.1.9-arm64-darwin) + thruster (0.1.9-x86_64-darwin) + thruster (0.1.9-x86_64-linux) timeout (0.4.2) trailblazer-option (0.1.2) turbo-rails (2.0.11) @@ -539,6 +544,7 @@ DEPENDENCIES solid_cable solid_cache standard + thruster turbo-rails tzinfo-data web-console