dockerfile-rails 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d84e3358f7afd8b5729d49e6b427e03f92eb6fe5da6a258689e933c09d721a2
-  data.tar.gz: 897d2a5f53c344c7162953e757b751ff646192ecd880f61cfb1754da5dfbb76d
+  metadata.gz: b68e838d9adbcc0404f7f38780918b72d21677922ac627c87bc6d949388e8940
+  data.tar.gz: 98a5cf029b0bd032491c47397ddd3439504629a013ecf371e936817b4ada72ec
 SHA512:
-  metadata.gz: dd9b469a7c2c562c4cf137670c0d2fa177449c00ccb109e9aca65e0c48cb07d35b0a614c64daaaae699596eb2e191c7da4fcde1fc3da0566c3deed56e1b82494
-  data.tar.gz: 4ec4f71ecc02555da309027504872e137ccffa936b42ef42c935f2d0349b49cbccdfc39924f284653c952096bc3ea8014d9218eed92e7e71cfac15555e860705
+  metadata.gz: 1cc411c1fd37d189592dcacdbad37c572619afb46906d72377dfacc24ef2cf28628d62b898d482cc2845fe1e743304e1abbab44c504da6ccfe6c47b31a7ff16a
+  data.tar.gz: f8e4812222ced1477b7707e668bee69834858a66c2dc931822fc822891dc6fdef0608144a9cfd0757e95d7fedffbed6175365337e693bbbae8198ea6e78b4d11

data/README.md

@@ -17,6 +17,7 @@ General options:
 
 * `--force` - overwrite existing files
 * `--ci` - include test gems in deployed image
+* `--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
 * `--compose` - generate a `docker-compose.yml` file
@@ -36,8 +37,8 @@ Optimizations:
 
 * `--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
-* `--yjit` - enable [YJIT](https://github.com/ruby/ruby/blob/master/doc/yjit/yjit.md) optimizing compiler.
-* `--swap=n` - allocate swap space.  See [falloc options](https://man7.org/linux/man-pages/man1/fallocate.1.html#OPTIONS) for suffixes.
+* `--yjit` - enable [YJIT](https://github.com/ruby/ruby/blob/master/doc/yjit/yjit.md) optimizing compiler
+* `--swap=n` - allocate swap space.  See [falloc options](https://man7.org/linux/man-pages/man1/fallocate.1.html#OPTIONS) for suffixes
 
 Links:
 

data/lib/dockerfile-rails/scanner.rb

@@ -26,9 +26,13 @@ module DockerfileRails
       end
       
       if File.exist? 'Gemfile'
-        gemfile_definition = Bundler::Definition.build('Gemfile', nil, [])
-        @gemfile += gemfile_definition.dependencies.map(&:name)
-        @git = !gemfile_definition.spec_git_paths.empty?
+        begin
+          gemfile_definition = Bundler::Definition.build('Gemfile', nil, [])
+          @gemfile += gemfile_definition.dependencies.map(&:name)
+          @git = !gemfile_definition.spec_git_paths.empty?
+        rescue => error
+          STDERR.puts error.message
+        end
       end
 
       @sidekiq = @gemfile.include? 'sidekiq'
@@ -67,4 +71,4 @@ module DockerfileRails
       @redis = @redis_cable || @redis_cache || @sidekiq
     end
   end
-end
+end

data/lib/generators/dockerfile_generator.rb

@@ -30,6 +30,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :mysql, type: :boolean, default: false,
     desc: 'include mysql libraries'
 
+  class_option :platform, type: :string, default: nil,
+    desc: 'image platform (example: linux/arm64)'
+
   class_option :jemalloc, type: :boolean, default: false,
     desc: 'use jemalloc alternative malloc implementation'
   
@@ -81,6 +84,14 @@ private
     ERB.new(template, trim_mode: '-').result(scope.get_binding).strip
   end
 
+  def platform
+    if options.platform
+      "--platform #{options.platform} "
+    else
+      ""
+    end
+  end
+
   def using_node?
     return @using_node if @using_node != nil
     @using_node = File.exist? 'package.json'

data/lib/generators/templates/Dockerfile.erb

@@ -8,9 +8,9 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 
 <% end -%>
 <% if options.fullstaq -%>
-FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= @options.jemalloc ? 'jemalloc-' : '' %>slim as base
+FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= @options.jemalloc ? 'jemalloc-' : '' %>slim as base
 <% else -%>
-FROM ruby:$RUBY_VERSION-slim as base
+FROM <%= platform %>ruby:$RUBY_VERSION-slim as base
 <% end -%>
 
 # Rails app lives here
@@ -124,7 +124,11 @@ COPY --from=client /rails/<%= api_client_dir %>/build /rails/public
 ENV RAILS_LOG_TO_STDOUT="1" \
     RAILS_SERVE_STATIC_FILES="true"<% if options.yjit %> \
     RUBY_YJIT_ENABLE="1"<% end %><% if options.jemalloc and not options.fullstaq %> \
+<% if (options.platform || Gem::Platform::local.cpu).include? 'arm' -%>
+    LD_PRELOAD="/usr/lib/aarch64-linux-gnu/libjemalloc.so.2" \
+<% else -%>
     LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" \
+<% end -%>
     MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"<% end %>
 
 # Entrypoint prepares the database.

data/lib/generators/templates/_node_client.erb

@@ -1,6 +1,6 @@
 ARG NODE_VERSION=<%= node_version %>
 
-FROM node:$NODE_VERSION-slim as client
+FROM <%= platform %>node:$NODE_VERSION-slim as client
 
 WORKDIR /rails/<%= api_client_dir %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Sam Ruby