dockerfile-rails 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0227d5ff2b7d0a0d42d48ba7e3be63280ea528f3f80417a6419dfebbec44b3a7
-  data.tar.gz: ee9b4b14b72b85193a6e7b54862f6643b02896c5ff4636b294a845e7ae6a1b35
+  metadata.gz: 54eedb6e7aa9530a02b253ea1b730b386c2b87a49a00a64611c4c6d96e762505
+  data.tar.gz: f47c1b6851c2a3c3e2bacbb999ad0a7ad43d4b28d64a9cde83c392762d810342
 SHA512:
-  metadata.gz: 2e9f99b443c3cab5dca0d5800eb996b7f727ef0dbfcf44ad0e1586edf1ed9691b3cafbf1c608f207a55c63fd9d768e2796c4d3644c3e6715214ca5aa159ae122
-  data.tar.gz: 6980319c05859df14c35649159c874271162ff83ac1c2918e4c959c93f6f39b29f5a4002cbf9305f82404ae8b5d00ee4d0e401e420c37a86abb6b0c8362adcf8
+  metadata.gz: 9ed32b4fd6b57906c1e7b2f47270b5edeb96ea710891c9817989c44ea693095e35110b833b4994877e931d3dd0b6ede9b8cac21348120a4ae80b691cfe307c7c
+  data.tar.gz: db989d76c9f7e48553a3047b2096fa38708495c0a854bdd0a9805f92152018660850804464f45e3ceed0d0a6cd43809b64bc54b7606f945b5fe3bd25e2cf3797

data/README.md

@@ -19,11 +19,12 @@ General options:
 * `--force` - overwrite existing files
 * `--ci` - include test gems in deployed image
 * `--bin-cd` - adjust binstubs to set current working directory
-* `--no-prepare` - omit `db:prepare`.  Useful for cloud platforms with [release](https://devcenter.heroku.com/articles/release-phase) phases.
-* `--platform=s` - specify target platform.  See [FROM](https://docs.docker.com/engine/reference/builder/#from) for details.
+* `--no-prepare` - omit `db:prepare`.  Useful for cloud platforms with [release](https://devcenter.heroku.com/articles/release-phase) phases
+* `--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
+* `--label=name:value` - specify docker label.  Can be used multiple times.  See [LABEL](https://docs.docker.com/engine/reference/builder/#label) for details
 
 Dependencies:
 

data/lib/dockerfile-rails/scanner.rb

@@ -25,6 +25,9 @@ module DockerfileRails
       if File.exist? 'Gemfile.lock'
         parser = Bundler::LockfileParser.new(Bundler.read_file('Gemfile.lock'))
         @gemfile += parser.specs.map { |spec, version| spec.name }
+        @git ||= ENV['RAILS_ENV'] != 'test' && parser.specs.any? do |spec|
+          spec.source.instance_of? Bundler::Source::Git
+        end
       end
       
       if File.exist? 'Gemfile'

data/lib/generators/dockerfile_generator.rb

@@ -19,15 +19,21 @@ class DockerfileGenerator < Rails::Generators::Base
     'redis' => false,
     'swap' => nil,
     'yjit' => false,
+    'label' => {},
   )
 
+  @@labels = {}
+
   # load defaults from config file
   if File.exist? 'config/dockerfile.yml'
     options = YAML.safe_load_file('config/dockerfile.yml', symbolize_names: true)[:options]
+
     if options
       OPTION_DEFAULTS.to_h.each do |option, value|
         OPTION_DEFAULTS[option] = options[option] if options.include? option 
       end
+
+      @@labels = options[:label].stringify_keys if options.include? :label
     end
   end
 
@@ -76,9 +82,15 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :yjit, type: :boolean, default: OPTION_DEFAULTS.yjit,
     desc: 'enable YJIT optimizing compiler'
 
+  class_option :label, type: :hash, default: {},
+    desc: 'Add Docker label(s)'
+
   def generate_app
     source_paths.push File.expand_path('./templates', __dir__)
 
+    # merge options
+    options.label.replace(@@labels.merge(options.label).select {|key, value| value != ''})
+
     # gather up options for config file
     @dockerfile_config = OPTION_DEFAULTS.dup.to_h.stringify_keys
     options.to_h.each do |option, value|

data/lib/generators/templates/Dockerfile.erb

@@ -13,6 +13,12 @@ FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= @options.je
 FROM <%= platform %>ruby:$RUBY_VERSION-slim as base
 <% end -%>
 
+<% unless options.label.empty? -%>
+<% options.label.each do |key, value| -%>
+LABEL <%= key =~ /^\w[.\w]*$/ ? key : key.inspect %>=<%= value.inspect %>
+<% end -%>
+
+<% end -%>
 # Rails app lives here
 WORKDIR /rails
 

metadata

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