kuby-core 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5f265cee423b7487de7e4c209b26cc9fef63cf584455bc4164ecd7e6384377
-  data.tar.gz: e48304bf9397b30ceed7025039d074e55423ced190f734a416a311e412bd609d
+  metadata.gz: 1bb1eba2c179a03610f3f478f595c43638e692b41ebad53c7d6292ef5699000a
+  data.tar.gz: b9003940ecba163e1f9c08100223d6059920f7f9a2d8ebff0c038e1fd5f335ee
 SHA512:
-  metadata.gz: d4cbd6c2fbf6de8f621d4b2412bb4c1921eff7e5ba3c90b5afefac3c0d216aff676772b0582dab70a688c3c1dc7ce55a48f9c42f3b178ad25f31d489a3f33421
-  data.tar.gz: b9b3f808ed6184c73edb8652a958cd53b12337c8a48bf2f19d188b07c1c4d56283f7bfbfffd2a9338dc522a2376f8665e9c792571b4fdb609bf14b0181efcc16
+  metadata.gz: fad183f5c697c6f6a06da8984dff19e0feac91b1996ae79a6605cafb612c77590461f80807ac87854124a97eef31e2999b39a64f997ef4f0fc77564365d81602
+  data.tar.gz: 1df3f9153d1595d085511329a5c1110117fa626632438a635f162c38cbe9c48d53df3098b28300408b89021365298b9972d07bdb9abd17b01bbc236e711ed3b8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.16.0
+* Allow Bundler executable to be customized.
+  - Main use-case is to allow adding in the Prebundler plugin, https://github.com/getkuby/kuby-prebundler.
+* Print error message and exit on missing Docker build args.
+  - Ignore with `--ignore-missing-args`.
+
 ## 0.15.0
 * Add an extra parameter to the Docker spec for specifying the URL of the Docker registry index.
   - In most cases, the registry and registry index URLs will be the same. However Docker Hub, the default registry, uses index.docker.io for API requests (catalog, tags, etc) but only allows pushes to docker.io.

data/lib/kuby/commands.rb

@@ -65,6 +65,7 @@ module Kuby
     desc 'Builds the Docker image.'
     command :build do |c|
       c.flag [:a, :arg], required: false, multiple: true
+      c.switch [:'ignore-missing-args'], required: false, default: false
       c.flag [:only], required: false
       c.action do |global_options, options, docker_args|
         build_args = {}.tap do |build_args|
@@ -75,7 +76,11 @@ module Kuby
           end
         end
 
-        tasks.build(build_args, docker_args, options[:only])
+        tasks.build(
+          build_args, docker_args,
+          only: options[:only],
+          ignore_missing_args: options[:'ignore-missing-args']
+        )
       end
     end
 
@@ -83,7 +88,7 @@ module Kuby
     command :push do |c|
       c.flag [:only], required: false
       c.action do |global_options, options, args|
-        tasks.push(options[:only])
+        tasks.push(only: options[:only])
       end
     end
 
@@ -98,7 +103,7 @@ module Kuby
     command :dockerfiles do |c|
       c.flag [:only], required: false
       c.action do |global_options, options, args|
-        tasks.print_dockerfiles(options[:only])
+        tasks.print_dockerfiles(only: options[:only])
       end
     end
 

data/lib/kuby/docker/bundler_phase.rb

@@ -29,6 +29,12 @@ module Kuby
       sig { params(without: T::Array[String]).void }
       attr_writer :without
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :executable
+
+      sig { params(executable: String).void }
+      attr_writer :executable
+
       sig { params(environment: Environment).void }
       def initialize(environment)
         super
@@ -37,6 +43,7 @@ module Kuby
         @gemfile = T.let(@gemfile, T.nilable(String))
         @gemfiles = T.let([], T::Array[String])
         @without = T.let(@without, T.nilable(T::Array[String]))
+        @executable = T.let(@executable, T.nilable(String))
       end
 
       sig { override.params(dockerfile: Dockerfile).void }
@@ -61,14 +68,14 @@ module Kuby
         end
 
         dockerfile.run(
-          'bundle', 'install',
+          executable || 'bundle', 'install',
           '--jobs', '$(nproc)',
           '--retry', '3',
           '--gemfile', gf
         )
 
         # generate binstubs and add the bin directory to our path
-        dockerfile.run('bundle', 'binstubs', '--all')
+        dockerfile.run(executable || 'bundle', 'binstubs', '--all')
         dockerfile.env("PATH=./bin:$PATH")
       end
 

data/lib/kuby/plugins/rails_app/assets_image.rb

@@ -29,6 +29,10 @@ module Kuby
         end
 
         def build(build_args = {}, docker_args = [])
+          unless ENV.fetch('RAILS_MASTER_KEY', '').empty?
+            build_args['RAILS_MASTER_KEY'] = ENV['RAILS_MASTER_KEY']
+          end
+
           docker_cli.build(current_version, build_args: build_args, docker_args: docker_args)
         end
 

data/lib/kuby/tasks.rb

@@ -9,7 +9,7 @@ module Kuby
       @environment = environment
     end
 
-    def print_dockerfiles(only = nil)
+    def print_dockerfiles(only: nil)
       kubernetes.docker_images.each do |image|
         next if only && image.identifier != only
 
@@ -28,8 +28,9 @@ module Kuby
       environment.kubernetes.setup
     end
 
-    def build(build_args = {}, docker_args = [], only = nil)
+    def build(build_args = {}, docker_args = [], only: nil, ignore_missing_args: false)
       check_platform(docker_args)
+      check_build_args(build_args) unless ignore_missing_args
 
       kubernetes.docker_images.each do |image|
         next if only && image.identifier != only
@@ -42,7 +43,7 @@ module Kuby
       end
     end
 
-    def push(only = nil)
+    def push(only: nil)
       kubernetes.docker_images.each do |image|
         next if only && image.identifier != only
 
@@ -159,6 +160,41 @@ module Kuby
       end
     end
 
+    def check_build_args(build_args)
+      required_args = kubernetes.docker_images.flat_map do |image|
+        image.dockerfile.commands.flat_map do |command|
+          case command
+            when Kuby::Docker::Dockerfile::Arg
+              command.args
+            else
+              []
+          end
+        end
+      end
+
+      required_args.uniq!
+
+      if File.exist?(File.join('config', 'master.key'))
+        required_args.delete('RAILS_MASTER_KEY')
+      end
+
+      missing_args = required_args - build_args.keys
+
+      if missing_args.any?
+        Kuby.logger.fatal(<<~END)
+          The following Docker build arguments are missing: #{missing_args.join(', ')}.
+          Please pass each argument to `kuby build` using the -a or --arg parameter (note
+          that the -a/--arg parameter can be specified multiple times). For example:
+
+          kuby build -a #{missing_args.first}=value ...
+
+          To ignore missing build args, pass the --ignore-missing-args parameter.
+        END
+
+        exit 1
+      end
+    end
+
     def perform_docker_login_if_necessary(image)
       auth_uris = image.docker_cli.auths.map do |url|
         Kuby::Docker::DockerURI.parse_uri(url)

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.15.0'.freeze
+  VERSION = '0.16.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize