dockerfile-rails 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7578107905d7265d79a480e52c9a960e58d5b5cde92e6a3c6de22e3a7c2b269
-  data.tar.gz: 8a1a483463c405746298d425a259838d18a1128231aac5e0c68733be607f1e7b
+  metadata.gz: 92c7394bd97da528362105514f095458b56872645ce0c3082c748c7bee22c54f
+  data.tar.gz: e7a158e41126aa6321e5b4461951b6323f7fa950f8eef8eb366ee436454c0057
 SHA512:
-  metadata.gz: 7d459f7291d6588b1f1b6353f27bde783f018f1f7dd16d80dc4f643cb8ec5a3934c5cc1d96eaabd857a7c0cb43a947917cdaf44b4e064e24397bfc2a8876f1cc
-  data.tar.gz: 0f4b1859a1b07a8f7b6e7e3679a7a3566a1957148f708d66be5be0ec2e2ead03706a4f7d30ac964a216e7912d0896bcf2e83612534a9c841780454c73c726b78
+  metadata.gz: 35619e605b9ed5176157c841efb21f4cfec9029c6383732d440bd9a440144719c8cc62e43974124148d5dbc1fb2705bd0160d4581f6829aa8ccdeb0040b665bb
+  data.tar.gz: 94b595caa9b67e1d814b863f535eae373dca80a5b14d410122a0b0199fdb46955ddb6d7609f3ce58945e9419047da6128864a751f8af36dbb2d8230bfd87f1d8

data/README.md

@@ -17,6 +17,7 @@ General options:
 
 * `--force` - overwrite existing files
 * `--ci` - include test gems in deployed image
+* `--bin-cd` - adjust binstubs to set current working directory
 * `--platform=s` - specify target platform.  See [FROM](https://docs.docker.com/engine/reference/builder/#from) for details.
 * `--cache` - use build caching to speed up builds
 * `--parallel` - use multi-stage builds to install gems and node modules in parallel
@@ -55,9 +56,14 @@ To assis with this process, outputs of tests can be captured automatically.  Thi
 
 ```
 rake test:capture
-TEST_CAPTURE=1 ruby test/test_minimal.rb
 ```
 
+If you are running a single test, the following environment variables settings may be helpful:
+
+ * `RAILS_ENV=TEST` will match the environment used to produce the captured outputs.
+ * `TEST_CAPTURE=1` will capture test results.
+ * `TEST_KEEP=1` will leave the test app behind for inspection after the test completes.
+
 ## Links
 
 Many of the following links relate to the current development status with respect to Rails 7.1 and will be removed once that is resolved.

data/lib/generators/dockerfile_generator.rb

@@ -7,6 +7,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :ci, type: :boolean, default: false,
     desc: 'include test gems in bundle'
 
+  class_option 'bin-cd', type: :boolean, default: false,
+    desc: 'modify binstubs to set working directory'
+
   class_option :cache, type: :boolean, default: false,
     desc: 'use build cache to speed up installs'
 
@@ -210,6 +213,11 @@ private
       binfixups.unshift "chmod +x bin/*"
     end
 
+    # optionally, adjust cwd
+    if options['bin-cd']
+      binfixups.push %{sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /app/bin/*}
+    end
+
     binfixups
   end
 

data/lib/generators/templates/Dockerfile.erb

@@ -19,7 +19,7 @@ WORKDIR /rails
 # Set production environment
 ENV RAILS_ENV="production" \
     BUNDLE_PATH="vendor/bundle" \
-    BUNDLE_WITHOUT="<%= options.ci? ? 'test' : 'development:test' %>"
+    BUNDLE_WITHOUT="<%= options.ci? ? 'development' : 'development:test' %>"
 
 # Update gems and preinstall the desired version of bundler
 ARG BUNDLER_VERSION=<%= Bundler::VERSION %>
@@ -70,14 +70,16 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
     mkdir -p vendor && \
     bundle config set path vendor && \
     cp -ar /srv/vendor .
+
 <% else -%>
 RUN bundle _${BUNDLER_VERSION}_ install<% if depend_on_bootsnap? -%> && \
-    bundle exec bootsnap precompile --gemfile
-<% end -%>
-<% end -%>
+    bundle exec bootsnap precompile --gemfile<% end %>
 
+<% end -%>
 <% if parallel? -%>
-asdf
+# Copy node modules
+COPY --from=node /rails/node_modules /rails/node_modules
+
 <% elsif using_node? -%>
 <%= render partial: 'npm_install', locals: {sources: %w(package.json yarn.lock)} %>
 
@@ -91,7 +93,11 @@ RUN bundle exec bootsnap precompile app/ lib/
 
 <% end -%>
 <% unless binfile_fixups.empty? -%>
-# Adjust binfiles to be executable on Linux
+<% if options['bin-cd'] and binfile_fixups.length == 1 -%>
+# Adjust binfiles to set current working directory
+<% else -%>
+# Adjust binfiles to be executable on Linux<%= options['bin-cd'] ? ' and set current working directory' : '' %>
+<% end -%>
 <%= "RUN " + binfile_fixups.join(" && \\\n    ") %>
 
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails