kuby-core 0.12.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a072588afc0cc4e0cf815c276628b90c192bf24310ed6c4c53089bc467ba278
-  data.tar.gz: 364b1265256eda0eea1f57469f241a1c78f1bdb2be0d37d8a23b5c6f01f4ff43
+  metadata.gz: 1bb1eba2c179a03610f3f478f595c43638e692b41ebad53c7d6292ef5699000a
+  data.tar.gz: b9003940ecba163e1f9c08100223d6059920f7f9a2d8ebff0c038e1fd5f335ee
 SHA512:
-  metadata.gz: 866438d8c0880d949150d337b01fce94dfab9d0606ab3e2358e4c7cad376bb36cb3ff958ea72188967abf1192216c3b7586ddcfba6d7e0324ab4fbe37a085e49
-  data.tar.gz: 87e438bd3f4783b1b3d0e7609d773f5eeee91f7b9ae980446c8ca63084bddeb3a525d944750fe13fb36e98d782188cf6bd06c3df5edff742d8a1d5d80aa53966
+  metadata.gz: fad183f5c697c6f6a06da8984dff19e0feac91b1996ae79a6605cafb612c77590461f80807ac87854124a97eef31e2999b39a64f997ef4f0fc77564365d81602
+  data.tar.gz: 1df3f9153d1595d085511329a5c1110117fa626632438a635f162c38cbe9c48d53df3098b28300408b89021365298b9972d07bdb9abd17b01bbc236e711ed3b8

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 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.
+* Add config/master.key to the .dockerignore created by the Rails generator.
+  - This was an unfortunate oversight, but such are the perils of using pre-1.0 software.
+* Print an error message if building images on non-x86 hardware.
+  - People with M1 Macs are running into mismatches between their laptop's arch and the arch of their hosting provider's hardware. The error message asks you to explicitly pass the `--platform` flag to Docker.
+  - We may need to revisit this in the future if ARM processors become more popular.
+
+## 0.14.0
+* Make RAILS_MASTER_KEY available in the assets image (@palkan, #63)
+* Allow specifying custom docker build options via CLI (@palkan, #65)
+
+## 0.13.0
+* Fix handling rails/rake options in remote exec (@palkan, #60)
+* Add `bundler_phase.gemfiles(*paths)` to allow adding additional gemfiles (@palkan, #61)
+
 ## 0.12.0
 * Fix issue causing volume mount errors when k8s tries to schedule asset pods on multiple nodes (fixes #42).
   - Persistent volumes can only be mounted on a single physical node.

data/README.md

@@ -1,6 +1,7 @@
 ## Kuby
 
-[![Build Status](https://travis-ci.com/getkuby/kuby-core.svg?branch=master)](https://travis-ci.com/getkuby/kuby-core)
+![Unit Tests](https://github.com/getkuby/kuby-core/actions/workflows/unit_tests.yml/badge.svg?branch=master)
+![Integration Tests](https://github.com/getkuby/kuby-core/actions/workflows/integration_tests.yml/badge.svg?branch=master)
 
 Deploy your Rails app the easy way.
 

data/lib/kuby/commands.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 
 require 'kuby/version'
 require 'gli'
@@ -25,9 +25,10 @@ module Kuby
       def run(args)
         if idx = args.index('rails') || idx = args.index('rake')
           @rails_options = T.let(@rails_options, T.nilable(T::Array[String]))
-          @rails_options = args[idx..-1]
+          @rails_options = args[(idx + 1)..-1]
           super(args[0..idx])
         else
+          @rails_options = []
           super
         end
       end
@@ -64,23 +65,30 @@ module Kuby
     desc 'Builds the Docker image.'
     command :build do |c|
       c.flag [:a, :arg], required: false, multiple: true
-      c.action do |global_options, options, args|
+      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|
           (options[:arg] || []).each do |a|
-            key, value = a.split('=')
+            key, value = a.split('=', 2)
             value = value[1..-2] if value.start_with?('"') || value.start_with?("'")
             build_args[key] = value
           end
         end
 
-        tasks.build(build_args)
+        tasks.build(
+          build_args, docker_args,
+          only: options[:only],
+          ignore_missing_args: options[:'ignore-missing-args']
+        )
       end
     end
 
     desc 'Pushes the Docker image to the configured registry.'
     command :push do |c|
+      c.flag [:only], required: false
       c.action do |global_options, options, args|
-        tasks.push
+        tasks.push(only: options[:only])
       end
     end
 
@@ -93,8 +101,9 @@ module Kuby
 
     desc 'Prints the effective Dockerfiles used to build Docker images.'
     command :dockerfiles do |c|
+      c.flag [:only], required: false
       c.action do |global_options, options, args|
-        tasks.print_dockerfiles
+        tasks.print_dockerfiles(only: options[:only])
       end
     end
 
@@ -116,8 +125,10 @@ module Kuby
 
     desc 'Prints the effective Kubernetes resources that will be applied on deploy.'
     command :resources do |c|
+      c.flag [:K, :kind], required: false
+      c.flag [:N, :name], required: false
       c.action do |global_options, options, args|
-        tasks.print_resources
+        tasks.print_resources(options[:kind], options[:name])
       end
     end
 
@@ -164,7 +175,7 @@ module Kuby
       rc.desc 'Runs an arbitrary command inside a running Rails pod.'
       rc.command :exec do |c|
         c.action do |global_options, options, args|
-          tasks.remote_exec(args)
+          tasks.remote_exec([*args, *T.unsafe(@rails_options)])
         end
       end
 

data/lib/kuby/docker/app_image.rb

@@ -6,13 +6,28 @@ module Kuby
     class AppImage < ::Kuby::Docker::TimestampedImage
       extend T::Sig
 
-      sig { params(build_args: T::Hash[String, String]).returns(AppImage) }
-      def build(build_args = {})
+      sig {
+        params(
+          dockerfile: T.any(Dockerfile, T.proc.returns(Dockerfile)),
+          image_url: String,
+          credentials: Credentials,
+          registry_index_url: T.nilable(String),
+          main_tag: T.nilable(String),
+          alias_tags: T::Array[String]
+        ).void
+      }
+      def initialize(dockerfile, image_url, credentials, registry_index_url = nil, main_tag = nil, alias_tags = [])
+        super
+        @identifier = "app"
+      end
+
+      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String]).returns(AppImage) }
+      def build(build_args = {}, docker_args = [])
         unless ENV.fetch('RAILS_MASTER_KEY', '').empty?
           build_args['RAILS_MASTER_KEY'] = T.must(ENV['RAILS_MASTER_KEY'])
         end
 
-        super(build_args)
+        super(build_args, docker_args)
       end
     end
   end

data/lib/kuby/docker/bundler_phase.rb

@@ -29,13 +29,21 @@ 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
 
         @version = T.let(@version, T.nilable(String))
         @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 }
@@ -51,22 +59,31 @@ module Kuby
         dockerfile.copy(gf, '.')
         dockerfile.copy(lf, '.')
 
+        @gemfiles.each do |file|
+          dockerfile.copy(file, file)
+        end
+
         unless wo.empty?
           dockerfile.env("BUNDLE_WITHOUT='#{wo.join(' ')}'")
         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
 
+      sig { params(paths: String).void }
+      def gemfiles(*paths)
+        @gemfiles.concat(paths)
+      end
+
       private
 
       sig { returns(String) }

data/lib/kuby/docker/cli.rb

@@ -53,15 +53,17 @@ module Kuby
         config.fetch('auths', {}).keys
       end
 
-      sig { params(image: Image, build_args: T::Hash[T.any(Symbol, String), String]).void }
-      def build(image, build_args: {})
+      sig { params(image: Image, build_args: T::Hash[T.any(Symbol, String), String], docker_args: T::Array[String]).void }
+      def build(image, build_args: {}, docker_args: [])
         cmd = [
           executable, 'build',
           *image.tags.flat_map { |tag| ['-t', "#{image.image_url}:#{tag}"] },
           *build_args.flat_map do |arg, val|
             ['--build-arg', Shellwords.shellescape("#{arg}=#{val}")]
           end,
-          '-f-', '.'
+          '-f-',
+          *docker_args,
+          '.'
         ]
 
         open3_w(cmd) do |stdin, _wait_threads|

data/lib/kuby/docker/docker_uri.rb

@@ -5,11 +5,36 @@ module Kuby
     class DockerURI
       extend T::Sig
 
-      DEFAULT_REGISTRY_HOST = T.let('index.docker.io'.freeze, String)
-      DEFAULT_REGISTRY_PORT = T.let(443, Integer)
+      DEFAULT_REGISTRY_HOST = T.let('docker.io'.freeze, String)
+      DEFAULT_REGISTRY_INDEX_HOST = T.let('index.docker.io'.freeze, String)
+      DEFAULT_PORT = T.let(443, Integer)
 
       sig { params(url: String).returns(DockerURI) }
-      def self.parse(url)
+      def self.parse_uri(url)
+        parse(
+          url,
+          default_host: DEFAULT_REGISTRY_HOST,
+          default_port: DEFAULT_PORT
+        )
+      end
+
+      sig { params(url: String).returns(DockerURI) }
+      def self.parse_index_uri(url)
+        parse(
+          url,
+          default_host: DEFAULT_REGISTRY_INDEX_HOST,
+          default_port: DEFAULT_PORT
+        )
+      end
+
+      sig {
+        params(
+          url: String,
+          default_host: T.nilable(String),
+          default_port: T.nilable(Integer)
+        ).returns(DockerURI)
+      }
+      def self.parse(url, default_host:, default_port:)
         if idx = url.index('://')
           url = url[(idx + 3)..-1] || ''
         end
@@ -17,9 +42,9 @@ module Kuby
         host_port, *path = url.split('/')
         host, port, *path = if host_port =~ /[.:]/
           hst, prt = T.must(host_port).split(':')
-          [T.must(hst), prt || DEFAULT_REGISTRY_PORT, *path]
+          [T.must(hst), prt || default_port, *path]
         else
-          [DEFAULT_REGISTRY_HOST, DEFAULT_REGISTRY_PORT, host_port, *path]
+          [default_host, default_port, host_port, *path]
         end
 
         new(host.to_s, port.to_i, (path || []).join('/'))
@@ -40,6 +65,11 @@ module Kuby
         @port = port
         @path = path
       end
+
+      sig { returns(T::Boolean) }
+      def has_default_port?
+        port == DEFAULT_PORT
+      end
     end
   end
 end

data/lib/kuby/docker/image.rb

@@ -5,9 +5,15 @@ module Kuby
     class Image
       extend T::Sig
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :identifier
+
       sig { returns(String) }
       attr_reader :image_url
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :registry_index_url
+
       sig { returns(Credentials) }
       attr_reader :credentials
 
@@ -22,19 +28,25 @@ module Kuby
           dockerfile: T.any(Dockerfile, T.proc.returns(Dockerfile)),
           image_url: String,
           credentials: Credentials,
+          registry_index_url: T.nilable(String),
           main_tag: T.nilable(String),
           alias_tags: T::Array[String]
         ).void
       }
-      def initialize(dockerfile, image_url, credentials, main_tag = nil, alias_tags = [])
+      def initialize(dockerfile, image_url, credentials, registry_index_url = nil, main_tag = nil, alias_tags = [])
         @dockerfile = T.let(dockerfile, T.any(Dockerfile, T.proc.returns(Dockerfile)))
         @image_url = T.let(image_url, String)
+        @registry_index_url = T.let(registry_index_url, T.nilable(String))
         @credentials = T.let(credentials, Credentials)
         @main_tag = T.let(main_tag, T.nilable(String))
         @alias_tags = T.let(alias_tags, T::Array[String])
+        @identifier = T.let(@identifier, T.nilable(String))
 
         @image_host = T.let(@image_host, T.nilable(String))
         @image_hostname = T.let(@image_hostname, T.nilable(String))
+        @registry_index_host = T.let(@registry_index_host, T.nilable(String))
+        @registry_index_hostname = T.let(@registry_index_hostname, T.nilable(String))
+        @registry_index_uri = T.let(@registry_index_uri, T.nilable(DockerURI))
         @image_repo = T.let(@image_repo, T.nilable(String))
         @full_image_uri = T.let(@full_image_uri, T.nilable(DockerURI))
         @docker_cli = T.let(@docker_cli, T.nilable(Docker::CLI))
@@ -69,6 +81,16 @@ module Kuby
         @image_host ||= "#{image_uri.host}:#{image_uri.port}"
       end
 
+      sig { returns(String) }
+      def registry_index_host
+        @registry_index_host ||= "#{registry_index_uri.host}:#{registry_index_uri.port}"
+      end
+
+      sig { returns(String) }
+      def registry_index_hostname
+        @registry_index_hostname ||= registry_index_uri.host
+      end
+
       sig { returns(String) }
       def image_hostname
         @image_hostname ||= image_uri.host
@@ -81,7 +103,12 @@ module Kuby
 
       sig { returns(DockerURI) }
       def image_uri
-        @full_image_uri ||= DockerURI.parse(image_url)
+        @full_image_uri ||= DockerURI.parse_uri(image_url)
+      end
+
+      sig { returns(DockerURI) }
+      def registry_index_uri
+        @registry_index_uri ||= DockerURI.parse_index_uri(registry_index_url || image_url)
       end
 
       sig { returns(T::Array[String]) }
@@ -89,8 +116,8 @@ module Kuby
         [main_tag, *alias_tags].compact
       end
 
-      sig { params(build_args: T::Hash[String, String]).void }
-      def build(build_args = {})
+      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String]).void }
+      def build(build_args = {}, docker_args = [])
         raise NotImplementedError, 'please use a Docker::Image subclass'
       end
 
@@ -108,7 +135,7 @@ module Kuby
 
       sig { params(main_tag: String, alias_tags: T::Array[String]).returns(Image) }
       def duplicate_with_tags(main_tag, alias_tags)
-        self.class.new(dockerfile, image_url, credentials, main_tag, alias_tags)
+        self.class.new(dockerfile, image_url, credentials, registry_index_url, main_tag, alias_tags)
       end
     end
   end

data/lib/kuby/docker/spec.rb

@@ -13,6 +13,9 @@ module Kuby
       sig { returns(T.nilable(String)) }
       attr_reader :image_url_str
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :registry_index_url_str
+
       sig { params(environment: Environment).void }
       def initialize(environment)
         @environment = environment
@@ -31,6 +34,7 @@ module Kuby
         @layer_stack = T.let(@layer_stack, T.nilable(Kuby::Docker::LayerStack))
 
         @image_url_str = T.let(@image_url_str, T.nilable(String))
+        @registry_index_url_str = T.let(@registry_index_url_str, T.nilable(String))
         @image = T.let(@image, T.nilable(Docker::AppImage))
       end
 
@@ -96,6 +100,11 @@ module Kuby
         @image_url_str = url
       end
 
+      sig { params(url: String).void }
+      def registry_index_url(url)
+        @registry_index_url_str = url
+      end
+
       sig {
         params(
           name: Symbol,
@@ -148,7 +157,7 @@ module Kuby
           end
 
           Docker::AppImage.new(
-            dockerfile, T.must(image_url_str), credentials
+            dockerfile, T.must(image_url_str), credentials, registry_index_url_str
           )
         end
       end

data/lib/kuby/docker/timestamped_image.rb

@@ -12,11 +12,12 @@ module Kuby
           dockerfile: T.any(Dockerfile, T.proc.returns(Dockerfile)),
           image_url: String,
           credentials: Credentials,
+          registry_index_url_str: T.nilable(String),
           main_tag: T.nilable(String),
           alias_tags: T::Array[String]
         ).void
       }
-      def initialize(dockerfile, image_url, credentials, main_tag = nil, alias_tags = [])
+      def initialize(dockerfile, image_url, credentials, registry_index_url_str = nil, main_tag = nil, alias_tags = [])
         @new_version = T.let(@new_version, T.nilable(Image))
         @current_version = T.let(@current_version, T.nilable(Image))
         @previous_version = T.let(@previous_version, T.nilable(Image))
@@ -73,9 +74,9 @@ module Kuby
         tag
       end
 
-      sig { params(build_args: T::Hash[String, String]).void }
-      def build(build_args = {})
-        docker_cli.build(new_version, build_args: build_args)
+      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String]).void }
+      def build(build_args = {}, docker_args = [])
+        docker_cli.build(new_version, build_args: build_args, docker_args: docker_args)
         @current_version = new_version
         @new_version = nil
       end
@@ -90,7 +91,7 @@ module Kuby
       sig { returns(::Docker::Remote::Client) }
       def remote_client
         @remote_client ||= ::Docker::Remote::Client.new(
-          image_host, image_repo, credentials.username, credentials.password,
+          registry_index_host, image_repo, credentials.username, credentials.password,
         )
       end
 
@@ -106,7 +107,7 @@ module Kuby
 
       sig { returns(RemoteTags) }
       def remote
-        @remote ||= RemoteTags.new(remote_client, image_url)
+        @remote ||= RemoteTags.new(remote_client, registry_index_host)
       end
     end
   end

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

@@ -296,7 +296,7 @@ module Kuby
         end
 
         def image
-          @image ||= RailsApp::AssetsImage.new(docker.image, -> { dockerfile })
+          @image ||= RailsApp::AssetsImage.new(docker.image, -> { dockerfile }, docker.image.registry_index_url)
         end
 
         private
@@ -317,14 +317,16 @@ module Kuby
             tags.each_cons(2) do |prev_tag, tag|
               prev_image_name = "#{app_name}-#{prev_tag}"
               df.from("#{base_image.image_url}:#{prev_tag}", as: prev_image_name)
+              df.arg('RAILS_MASTER_KEY')
               df.run("mkdir -p #{RAILS_MOUNT_PATH}")
-              df.run("bundle exec rake kuby:rails_app:assets:copy")
+              df.run("env RAILS_MASTER_KEY=$RAILS_MASTER_KEY bundle exec rake kuby:rails_app:assets:copy")
 
               if tag
                 image_name = "#{app_name}-#{tag}"
                 df.from("#{base_image.image_url}:#{tag}", as: image_name)
+                df.arg('RAILS_MASTER_KEY')
                 df.copy("--from=#{prev_image_name} #{RAILS_MOUNT_PATH}", RAILS_MOUNT_PATH)
-                df.run("bundle exec rake kuby:rails_app:assets:copy")
+                df.run("env RAILS_MASTER_KEY=$RAILS_MASTER_KEY bundle exec rake kuby:rails_app:assets:copy")
               end
             end
 

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

@@ -4,9 +4,10 @@ module Kuby
       class AssetsImage < ::Kuby::Docker::Image
         attr_reader :base_image
 
-        def initialize(base_image, dockerfile, main_tag = nil, alias_tags = [])
-          super(dockerfile, base_image.image_url, base_image.credentials, main_tag, alias_tags)
+        def initialize(base_image, dockerfile, registry_index_url = nil, main_tag = nil, alias_tags = [])
+          super(dockerfile, base_image.image_url, base_image.credentials, registry_index_url, main_tag, alias_tags)
           @base_image = base_image
+          @identifier = "assets"
         end
 
         def new_version
@@ -27,8 +28,12 @@ module Kuby
           )
         end
 
-        def build(build_args = {})
-          docker_cli.build(current_version, build_args: build_args)
+        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
 
         def push(tag)
@@ -41,6 +46,7 @@ module Kuby
           self.class.new(
             base_image,
             dockerfile,
+            registry_index_url,
             annotate_tag(image.main_tag),
             image.alias_tags.map { |at| annotate_tag(at) }
           )

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

@@ -86,16 +86,38 @@ class KubyGenerator < Rails::Generators::Base
     create_file(
       '.dockerignore',
       <<~END
-        .bundle/
-        vendor/bundle
-        node_modules/
-        .node_modules/
-        **/.git*
-        tmp/
-        log/
-        engines/**/log/
-        engines/**/tmp/
+        .git/
+
+        # Ignore bundler config.
+        .bundle
+
+        # Ignore all logfiles and tempfiles.
+        log/*
+        tmp/*
+        !log/.keep
+        !tmp/.keep
+
+        # Ignore pidfiles, but keep the directory.
+        tmp/pids/*
+        !tmp/pids/
+        !tmp/pids/.keep
+
+        # Ignore uploaded files in development.
+        storage/*
+        !storage/.keep
+
         public/assets
+        **/.byebug_history
+
+        # Ignore master key for decrypting credentials and more.
+        config/master.key
+
+        public/packs
+        public/packs-test
+        node_modules
+        yarn-error.log
+        **/yarn-debug.log*
+        **/.yarn-integrity
       END
     )
   end

data/lib/kuby/tasks.rb

@@ -9,10 +9,13 @@ module Kuby
       @environment = environment
     end
 
-    def print_dockerfiles
+    def print_dockerfiles(only: nil)
       kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
+
         image = image.current_version
-        Kuby.logger.info("Dockerfile for image #{image.image_url} with tags #{image.tags.join(', ')}")
+        identifier = image.identifier ? " ##{image.identifier}" : ""
+        Kuby.logger.info("Dockerfile for#{identifier} image #{image.image_url} with tags #{image.tags.join(', ')}")
         theme = Rouge::Themes::Base16::Solarized.new
         formatter = Rouge::Formatters::Terminal256.new(theme)
         lexer = Rouge::Lexers::Docker.new
@@ -25,16 +28,25 @@ module Kuby
       environment.kubernetes.setup
     end
 
-    def build(build_args = {})
+    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
+
+        return unless perform_docker_login_if_necessary(image)
+
         image = image.new_version
         Kuby.logger.info("Building image #{image.image_url} with tags #{image.tags.join(', ')}")
-        image.build(build_args)
+        image.build(build_args, docker_args)
       end
     end
 
-    def push
+    def push(only: nil)
       kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
+
         image = image.current_version
         Kuby.logger.info("Pushing image #{image.image_url} with tags #{image.tags.join(', ')}")
         push_image(image)
@@ -42,21 +54,7 @@ module Kuby
     end
 
     def push_image(image)
-      if image.credentials.username && !image.docker_cli.auths.include?(image.image_host)
-        Kuby.logger.info("Attempting to log in to registry at #{image.image_host}")
-
-        begin
-          image.docker_cli.login(
-            url: image.image_host,
-            username: image.credentials.username,
-            password: image.credentials.password
-          )
-        rescue Kuby::Docker::LoginError => e
-          Kuby.logger.fatal("Couldn't log in to the registry at #{image.image_host}")
-          Kuby.logger.fatal(e.message)
-          return
-        end
-      end
+      return unless perform_docker_login_if_necessary(image)
 
       begin
         image.tags.each { |tag| image.push(tag) }
@@ -77,10 +75,16 @@ module Kuby
       environment.kubernetes.rollback
     end
 
-    def print_resources
+    def print_resources(kind = nil, name_pattern = nil)
       kubernetes.before_deploy
 
+      name_rxp = Regexp.new(name_pattern) if name_pattern
+
       kubernetes.resources.each do |res|
+        next if kind && res.kind_sym.to_s != kind
+
+        next if name_rxp && !name_rxp.match?(res.metadata.name)
+
         puts res.to_resource.serialize.to_yaml
       end
     end
@@ -132,6 +136,106 @@ module Kuby
 
     private
 
+    def check_platform(docker_args)
+      arch, * = RUBY_PLATFORM.split('-')
+
+      if arch != 'x86_64' && !docker_args.include?('--platform')
+        Kuby.logger.fatal(<<~END)
+          Hey there! It looks like your processor isn't x86-compatible.
+          By default, Docker will try to build images that match the
+          current architecture, in this case #{arch}. Most hosting
+          providers run x86 hardware, meaning Docker images built using
+          this computer's architecture might fail to run when deployed
+          to production. You can fix this by running the build command
+          with a special --platform flag, eg:
+
+          bundle exec kuby -e production build -- --platform linux/amd64
+
+          If you meant to build for the current architecture, you can
+          prevent this error by passing the --platform argument for the
+          current architecture, eg. --platform linux/arm64 for ARM, etc.
+        END
+
+        exit 1
+      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)
+      end
+
+      logged_in = image.credentials.username && (
+        auth_uris.any? do |uri|
+          image.image_hostname == uri.host ||
+            image.registry_index_hostname == uri.host
+        end
+      )
+
+      if !logged_in
+        Kuby.logger.info("Attempting to log in to registry at #{image.image_host}")
+
+        begin
+          # For some reason, Docker login with a port doesn't work for some
+          # registries (most notably Docker Hub). Since the default is 443 anyway,
+          # it should be fine to omit it.
+          url = if image.image_uri.has_default_port?
+            image.image_hostname  # host without port
+          else
+            image.image_host      # host with port
+          end
+
+          image.docker_cli.login(
+            url: url,
+            username: image.credentials.username,
+            password: image.credentials.password
+          )
+        rescue Kuby::Docker::LoginError => e
+          Kuby.logger.fatal("Couldn't log in to the registry at #{image.image_host}")
+          Kuby.logger.fatal(e.message)
+
+          return false
+        end
+      end
+
+      true
+    end
+
     def get_first_pod
       pods = kubernetes_cli.get_objects(
         'pods', namespace, match_labels.serialize

data/lib/kuby/version.rb

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

data/spec/docker/spec_spec.rb

@@ -107,6 +107,18 @@ describe Kuby::Docker::Spec do
         expect(subject).to match(/RUN bundle install .* --gemfile foo\/bar\/Gemfile/)
       end
     end
+
+    context 'when multiple gemfiles are specified' do
+      before { spec.bundler_phase.gemfiles('gemfiles/a.gemfile', 'gemfiles/b.gemfile') }
+
+      it 'uses all gemfiles including the default one' do
+        expect(subject).to include("COPY Gemfile .\n")
+        expect(subject).to include("COPY Gemfile.lock .\n")
+        expect(subject).to include("COPY gemfiles/a.gemfile gemfiles/a.gemfile\n")
+        expect(subject).to include("COPY gemfiles/b.gemfile gemfiles/b.gemfile\n")
+        expect(subject).to match(/RUN bundle install .* --gemfile Gemfile/)
+      end
+    end
   end
 
   describe '#package' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -290,7 +290,6 @@ files:
 - spec/docker/timestamp_tag_spec.rb
 - spec/docker/timestamped_image_spec.rb
 - spec/dummy/Gemfile
-- spec/dummy/Gemfile.lock
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -334,7 +333,6 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/master.key
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/spring.rb
@@ -351,7 +349,6 @@ files:
 - spec/dummy/test/application_system_test_case.rb
 - spec/dummy/test/channels/application_cable/connection_test.rb
 - spec/dummy/test/test_helper.rb
-- spec/dummy/tmp/cache/bootsnap-load-path-cache
 - spec/spec_helper.rb
 - spec/support/docker/fake_cli.rb
 - spec/support/docker/remote/fake_client.rb
@@ -374,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Deploy your Rails app onto Kubernetes the easy way.

data/spec/dummy/Gemfile.lock

@@ -1,223 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bindex (0.8.1)
-    bootsnap (1.4.8)
-      msgpack (~> 1.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.33.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
-      xpath (~> 3.2)
-    childprocess (3.0.0)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
-    erubi (1.9.0)
-    ffi (1.13.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
-      activesupport (>= 5.0.0)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.7.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    msgpack (1.3.3)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
-    puma (4.3.5)
-      nio4r (~> 2.0)
-    rack (2.2.3)
-    rack-proxy (0.6.5)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (1.7.1)
-    rubyzip (2.3.0)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    web-console (4.0.4)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
-    webdrivers (4.4.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
-    webpacker (4.3.0)
-      activesupport (>= 4.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootsnap (>= 1.4.2)
-  byebug
-  capybara (>= 2.15)
-  jbuilder (~> 2.7)
-  listen (~> 3.2)
-  puma (~> 4.1)
-  rails (~> 6.0.3, >= 6.0.3.2)
-  sass-rails (>= 6)
-  selenium-webdriver
-  spring
-  spring-watcher-listen (~> 2.0.0)
-  sqlite3 (~> 1.4)
-  turbolinks (~> 5)
-  tzinfo-data
-  web-console (>= 3.3.0)
-  webdrivers
-  webpacker (~> 4.0)
-
-RUBY VERSION
-   ruby 2.5.8p224
-
-BUNDLED WITH
-   2.1.4

data/spec/dummy/config/master.key

@@ -1 +0,0 @@
-e02c0a6ae84e2533f0f5a02962d0ac35