dockerfile-rails 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b0eaffe4eadbac03e5393587f0377220a8dfd335f098d39a0c688e3d87aa90
-  data.tar.gz: 9b83eb7efda7065551580efcd0966e1609c6e52f85c8619a8cc193340dd0a696
+  metadata.gz: 438d7f814f08f6180930a72f8b2e6437cb3b53b45ff495d99a0e5abf5c85e361
+  data.tar.gz: 71d21d72fc2aea9062fa9ba15e491083d279caa050f264e36de424a42e70ef44
 SHA512:
-  metadata.gz: 030eebde1411bfd630bcb55f7120e439c39787d5b0ce791ffee804edd21223672ec567f2923c18cc5f7716458e300b31bf74971255858bd48f883a1f137e7b57
-  data.tar.gz: 9e4e0a31577564dc9fabb969b092b33d370794c5d62658b5bb513bb4cb342c37f0350a4bfe2ed48477e864e78249cce48463a69ff624b13c76b8b2c024855ee7
+  metadata.gz: eb59c4587e1f9b0b9dbd93b7e71e49a2211659bb3e8c9c9a58919f39b3d30963a41b954ad182c418c19df2edabbf68578494bce069306bc1947c18af1fcf1c7a
+  data.tar.gz: d3c30f95c8f17c44e1f4bc09639ed67a246e6d3b10646a758602bf97937e0da54507e1156b9728261a15ebba8de6618266002b5e6b5b02699bf0661f45da128b

data/lib/erbtest.rb

@@ -0,0 +1,41 @@
+TEMPLATE = <<-EOF
+  value is <%= five %>
+  other is <%= three %>
+EOF
+
+require 'delegate'
+require 'forwardable'
+class Scope < SimpleDelegator
+end
+
+require 'erb'
+class ShoppingList
+  def five
+    'FiVe'
+  end
+  
+  def initialize
+    renderer = ERB.new(TEMPLATE)
+    puts '***'
+
+    values = {one: 'One', three: 'tHrEe'}
+
+    scope = (Class.new(SimpleDelegator) do
+      extend Forwardable
+      def_delegators values, :one, :three
+
+      def three
+        3
+      end
+    end).new(self)
+
+    puts renderer.result(scope.get_binding)
+  end
+
+  def get_binding
+    binding
+  end
+end
+
+puts '?'
+test = ShoppingList.new

data/lib/generators/dockerfile_generator.rb

@@ -25,6 +25,15 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :mysql, type: :boolean, default: false,
     desc: 'include mysql libraries'
 
+  class_option :jemalloc, type: :boolean, default: false,
+    desc: 'use jemalloc alternative malloc implementation'
+  
+  class_option :fullstaq, type: :boolean, default: false,
+    descr: 'use Fullstaq Ruby image from Quay.io'
+
+  class_option :yjit, type: :boolean, default: false,
+    desc: 'enable YJIT optimizing compiler'
+
   def generate_app
     source_paths.push File.expand_path('./templates', __dir__)
 

data/lib/generators/templates/Dockerfile.erb

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=<%= Gem.ruby_version %>
+ARG RUBY_VERSION=<%= RUBY_VERSION %>
 <% if api_client_dir -%>
 ARG NODE_VERSION=<%= node_version %>
 
@@ -35,7 +35,11 @@ RUN npm run build
 
 
 <% end -%>
+<% if options.fullstaq -%>
+FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= @options.jemalloc ? 'jemalloc-' : '' %>slim as base
+<% else -%>
 FROM ruby:$RUBY_VERSION-slim as base
+<% end -%>
 
 # Rails app lives here
 WORKDIR /rails
@@ -169,7 +173,10 @@ COPY --from=client /rails/<%= api_client_dir %>/build /rails/public
 
 # Deployment options
 ENV RAILS_LOG_TO_STDOUT="1" \
-    RAILS_SERVE_STATIC_FILES="true"
+    RAILS_SERVE_STATIC_FILES="true"<% if options.yjit %> \
+    RUBY_YJIT_ENABLE="1"<% end %><% if options.jemalloc and not options.fullstaq %> \
+    LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" \
+    MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"<% end %>
 
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Ruby
@@ -36,6 +36,7 @@ files:
 - Rakefile
 - lib/dockerfile-rails.rb
 - lib/dockerfile-rails/scanner.rb
+- lib/erbtest.rb
 - lib/generators/dockerfile_generator.rb
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/docker-compose.yml.erb