kuby-core 0.14.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6d5377f043be7d0aa02cddf817a9dd7fdbaa500c2ed94a2fdb92fa7ef0c1cc
-  data.tar.gz: 57c6cb1a15c4385a7675a05637dbfd085e2b2f438f5429104ec66203e854dd68
+  metadata.gz: 06ed279a1b0ecaac0daed1b868610bac67e6564611360de4cd841a24827438e2
+  data.tar.gz: f8616a5b0ab87c4fb71afa3afba0e001760b3c0855b7670b976013de3c1db5d6
 SHA512:
-  metadata.gz: 9c903b0768473d63df1a3ddb9ee3146193abad9c809614f7ccd2e7b7c711a2a3effd3810a3b67780ee68ea3198b8770099fcb3fd4d2a334b39b664f59b8e9e8f
-  data.tar.gz: 69fc8934c14181930c03d3d3ffe050e2da0a85edbbd2f5bba38bf0509131149c643ea42577afcec3a4625057eab52f57bab1e00c3271bedcf491d2e11f1ae696
+  metadata.gz: d75bf991f55a97798152449606740b2d94c9a012ad7c17ea0b9b940c9ca9b3aad0e31baa4635ffeeec584144492d967054cdbfffa386c05c7427f1e90ac58e8f
+  data.tar.gz: 73b7718181d0e43ab1382c70a4a22da1835da30c887c2f42bc67bcce15d811aa0efab93df3a5fd6d28e2b2ce6d6dc3a73154a4cacdadcfeb9641ca0b2ba5604c

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 0.17.1
+* Allow storage class to be customized when using the built-in bare metal provider.
+* Fix a bug where the assets image would be built using the previous app image instead of the current one.
+* Centralize the lookup of the Rails master key (not user-facing).
+* Add descriptions to numerous CLI commands and their arguments.
+* CLI now accepts multiple `--only` flags passed to subcommands like `build`, `push`, etc.
+* Allow running setup steps for individual plugins.
+
+## 0.16.1
+* Fix a few bugs caused by leaving `continue-on-error: true` in the GitHub actions config 🤦
+  - Docker builds would fail if no previous images existed in the registry.
+  - The assets image would fail to build because `RAILS_MASTER_KEY` was not propagated correctly.
+* Use the kuby-prebundler gem in the integration tests instead of a custom layer.
+
+## 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)

data/lib/kuby/commands.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 
 require 'kuby/version'
 require 'gli'
@@ -62,10 +62,22 @@ module Kuby
       true
     end
 
-    desc 'Builds the Docker image.'
+    desc 'Builds Docker images.'
     command :build do |c|
+      c.desc 'Docker build argument.'
       c.flag [:a, :arg], required: false, multiple: true
-      c.flag [:only], required: false
+
+      c.desc 'When enabled, ignores missing build arguments.'
+      c.switch [:'ignore-missing-args'], required: false, default: false
+
+      c.desc 'Build only the images associated with the specified identifier(s). '\
+             'Run `kuby images` for a list of all valid identifiers (note that '\
+             'identifiers can be associated with more than one image).'
+      c.flag [:only], required: false, multiple: true
+
+      c.desc 'The directory to use as the Docker build context.'
+      c.flag [:c, :context], required: false
+
       c.action do |global_options, options, docker_args|
         build_args = {}.tap do |build_args|
           (options[:arg] || []).each do |a|
@@ -75,30 +87,42 @@ 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'],
+          context: options[:context]
+        )
       end
     end
 
-    desc 'Pushes the Docker image to the configured registry.'
+    desc 'Pushes Docker images to their associated registries.'
     command :push do |c|
-      c.flag [:only], required: false
+      c.desc 'Push only the images associated with the specified identifier(s). '\
+             'Run `kuby images` for a list of all valid identifiers (note that '\
+             'identifiers can be associated with more than one image).'
+      c.flag [:only], required: false, multiple: true
       c.action do |global_options, options, args|
-        tasks.push(options[:only])
+        tasks.push(only: options[:only])
       end
     end
 
     desc 'Gets your Kubernetes cluster ready to run your Rails app.'
     command :setup do |c|
+      c.desc 'Run the setup routines for only the specified plugin identifier(s).'
+      c.flag [:only], required: false, multiple: true
       c.action do |global_options, options, args|
-        tasks.setup
+        tasks.setup(only: options[:only])
       end
     end
 
     desc 'Prints the effective Dockerfiles used to build Docker images.'
     command :dockerfiles do |c|
-      c.flag [:only], required: false
+      c.desc 'Print Dockerfiles for only the images associated with the specified '\
+             'identifier(s).'
+      c.flag [:only], required: false, multiple: true
       c.action do |global_options, options, args|
-        tasks.print_dockerfiles(options[:only])
+        tasks.print_dockerfiles(only: options[:only])
       end
     end
 
@@ -111,7 +135,7 @@ module Kuby
       end
     end
 
-    desc 'Rolls back to the previous Docker tag.'
+    desc 'Rolls back to the previous release.'
     command :rollback do |c|
       c.action do |global_options, options, args|
         tasks.rollback
@@ -120,25 +144,37 @@ module Kuby
 
     desc 'Prints the effective Kubernetes resources that will be applied on deploy.'
     command :resources do |c|
+      c.desc 'Only print resources of the given kind.'
       c.flag [:K, :kind], required: false
+
+      c.desc 'Only print resources that match the given name.'
       c.flag [:N, :name], required: false
+
       c.action do |global_options, options, args|
         tasks.print_resources(options[:kind], options[:name])
       end
     end
 
-    desc 'Prints out the contents of the kubeconfig Kuby is using to communicate with your cluster.'
+    desc 'Prints out the contents of the kubeconfig file Kuby is using to communicate '\
+         'with your cluster.'
     command :kubeconfig do |c|
       c.action do |global_options, options, args|
         tasks.print_kubeconfig
       end
     end
 
+    desc 'Prints out the URLs to the latest Docker images in the Docker registry.'
+    command :images do |c|
+      c.action do |global_options, options, args|
+        tasks.print_images
+      end
+    end
+
     desc 'Runs an arbitrary kubectl command.'
     command :kubectl do |c|
       c.desc 'Prefixes the kubectl command with the namespace associated with '\
-        'the current environment. For example, if the Kuby env is "production", '\
-        'this option will prefix the kubectl command with "-n myapp-production".'
+             'the current environment. For example, if the Kuby env is "production", '\
+             'this option will prefix the kubectl command with "-n myapp-production".'
       c.switch [:N, :namespaced], default: false
       c.action do |global_options, options, args|
         if options[:namespaced]
@@ -170,7 +206,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, *@rails_options])
+          tasks.remote_exec([*args, *T.unsafe(@rails_options)])
         end
       end
 

data/lib/kuby/docker/app_image.rb

@@ -11,23 +11,15 @@ 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 = [])
         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, docker_args)
-      end
     end
   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/docker/cli.rb

@@ -53,8 +53,15 @@ module Kuby
         config.fetch('auths', {}).keys
       end
 
-      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: [])
+      sig {
+        params(
+          image: Image,
+          build_args: T::Hash[T.any(Symbol, String), String],
+          docker_args: T::Array[String],
+          context: T.nilable(String)
+        ).void
+      }
+      def build(image, build_args: {}, docker_args: [], context: nil)
         cmd = [
           executable, 'build',
           *image.tags.flat_map { |tag| ['-t', "#{image.image_url}:#{tag}"] },
@@ -63,7 +70,7 @@ module Kuby
           end,
           '-f-',
           *docker_args,
-          '.'
+          context || '.'
         ]
 
         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

@@ -11,6 +11,9 @@ module Kuby
       sig { returns(String) }
       attr_reader :image_url
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :registry_index_url
+
       sig { returns(Credentials) }
       attr_reader :credentials
 
@@ -25,13 +28,15 @@ 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])
@@ -39,6 +44,9 @@ module Kuby
 
         @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))
@@ -73,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
@@ -85,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]) }
@@ -93,8 +116,8 @@ module Kuby
         [main_tag, *alias_tags].compact
       end
 
-      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String]).void }
-      def build(build_args = {}, docker_args = [])
+      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String], context: T.nilable(String)).void }
+      def build(build_args = {}, docker_args = [], context: nil)
         raise NotImplementedError, 'please use a Docker::Image subclass'
       end
 
@@ -112,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))
@@ -30,16 +31,18 @@ module Kuby
 
       sig { returns(Image) }
       def new_version
-        @new_version ||= duplicate_with_tags(
-          TimestampTag.new(Time.now).to_s, [Kuby::Docker::LATEST_TAG]
-        )
+        @new_version ||= create_new_version
       end
 
       sig { returns(Image) }
       def current_version
-        @current_version ||= duplicate_with_tags(
-          latest_timestamp_tag.to_s, [Kuby::Docker::LATEST_TAG]
-        )
+        @current_version ||= begin
+          duplicate_with_tags(
+            latest_timestamp_tag.to_s, [Kuby::Docker::LATEST_TAG]
+          )
+        rescue MissingTagError
+          create_new_version
+        end
       end
 
       sig { params(current_tag: T.nilable(String)).returns(Image) }
@@ -73,11 +76,9 @@ module Kuby
         tag
       end
 
-      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
+      sig { params(build_args: T::Hash[String, String], docker_args: T::Array[String], context: T.nilable(String)).void }
+      def build(build_args = {}, docker_args = [], context: nil)
+        docker_cli.build(new_version, build_args: build_args, docker_args: docker_args, context: context)
       end
 
       sig { params(tag: String).void }
@@ -87,10 +88,17 @@ module Kuby
 
       private
 
+      sig { returns(Image) }
+      def create_new_version
+        duplicate_with_tags(
+          TimestampTag.new(Time.now).to_s, [Kuby::Docker::LATEST_TAG]
+        )
+      end
+
       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 +114,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/kubernetes/bare_metal_provider.rb

@@ -7,12 +7,13 @@ module Kuby
     class BareMetalProvider < Provider
       extend T::Sig
 
-      STORAGE_CLASS_NAME = T.let('hostpath'.freeze, String)
+      DEFAULT_STORAGE_CLASS = T.let('hostpath'.freeze, String)
 
       class Config
         extend ::KubeDSL::ValueFields
 
         value_fields :kubeconfig
+        value_fields :storage_class
       end
 
       sig { returns(Config) }
@@ -36,7 +37,7 @@ module Kuby
 
       sig { returns(String) }
       def storage_class_name
-        STORAGE_CLASS_NAME
+        config.storage_class
       end
 
       private
@@ -46,6 +47,7 @@ module Kuby
         configure do
           # default kubeconfig path
           kubeconfig File.join(ENV['HOME'], '.kube', 'config')
+          storage_class DEFAULT_STORAGE_CLASS
         end
       end
     end

data/lib/kuby/kubernetes/spec.rb

@@ -89,13 +89,23 @@ module Kuby
         @tag = nil
       end
 
-      def setup
-        provider.before_setup
-        provider.setup
+      def setup(only: [])
+        plugins = if only.empty?
+          @plugins
+        else
+          @plugins.each_with_object({}) do |(name, plg), memo|
+            memo[name] = plg if only.include?(name)
+          end
+        end
+
+        if only.empty?
+          provider.before_setup
+          provider.setup
+        end
 
-        @plugins.each { |_, plg| plg.before_setup }
-        @plugins.each { |_, plg| plg.setup }
-        @plugins.each { |_, plg| plg.after_setup }
+        plugins.each { |_, plg| plg.before_setup }
+        plugins.each { |_, plg| plg.setup }
+        plugins.each { |_, plg| plg.after_setup }
 
         provider.after_setup
       end

data/lib/kuby/plugin.rb

@@ -12,6 +12,7 @@ module Kuby
       # do nothing by default
     end
 
+    # install any global resources like operators, etc
     def setup
       # do nothing by default
     end

data/lib/kuby/plugin_registry.rb

@@ -1,6 +1,8 @@
 # typed: false
 module Kuby
   class PluginRegistry
+    include Enumerable
+
     ANY = 'any'.freeze
 
     def register(plugin_name, plugin_klass, environment: ANY)
@@ -19,6 +21,19 @@ module Kuby
       plugins_by_env[environment] || plugins_by_env[ANY]
     end
 
+    def each(&block)
+      return to_enum(__method__) unless block
+
+      @plugins.each_pair do |plugin_name, plugins_by_env|
+        plugins_by_env.each_pair do |env, plugin_klass|
+          case env
+            when ANY, Kuby.env
+              yield plugin_name, plugin_klass
+          end
+        end
+      end
+    end
+
     private
 
     def plugins

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
@@ -324,6 +324,7 @@ module Kuby
               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("env RAILS_MASTER_KEY=$RAILS_MASTER_KEY bundle exec rake kuby:rails_app:assets:copy")
               end

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

@@ -4,16 +4,18 @@ 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
-          # Asset images track the base image, so return the current version
+          # Asset images track the base image, so return the new version
           # here. There can be no asset image without a base image.
-          current_version
+          @new_version ||= duplicate_with_annotated_tags(
+            base_image.new_version
+          )
         end
 
         def current_version
@@ -28,8 +30,8 @@ module Kuby
           )
         end
 
-        def build(build_args = {}, docker_args = [])
-          docker_cli.build(current_version, build_args: build_args, docker_args: docker_args)
+        def build(build_args = {}, docker_args = [], context: nil)
+          docker_cli.build(new_version, build_args: build_args, docker_args: docker_args, context: context)
         end
 
         def push(tag)
@@ -42,6 +44,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/plugins/rails_app/plugin.rb

@@ -209,15 +209,7 @@ module Kuby
             type 'Opaque'
 
             data do
-              if master_key = ENV[MASTER_KEY_VAR]
-                add MASTER_KEY_VAR.to_sym, master_key
-              else
-                master_key_path = File.join(spec.root, 'config', 'master.key')
-
-                if File.exist?(master_key_path)
-                  add MASTER_KEY_VAR.to_sym, File.read(master_key_path).strip
-                end
-              end
+              add MASTER_KEY_VAR.to_sym, spec.master_key
             end
           end
 
@@ -434,6 +426,13 @@ module Kuby
         def namespace
           environment.kubernetes.namespace
         end
+
+        def master_key
+          @master_key ||= ENV[MASTER_KEY_VAR] || begin
+            master_key_path = File.join(root, 'config', 'master.key')
+            File.read(master_key_path).strip if File.exist?(master_key_path)
+          end
+        end
       end
     end
   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
 
@@ -24,23 +24,30 @@ module Kuby
       end
     end
 
-    def setup
-      environment.kubernetes.setup
+    def setup(only: [])
+      environment.kubernetes.setup(only: only.map(&:to_sym))
     end
 
-    def build(build_args = {}, docker_args = [], only = nil)
+    def build(build_args = {}, docker_args = [], only: [], ignore_missing_args: false, context: nil)
+      check_platform(docker_args)
+
+      build_args['RAILS_MASTER_KEY'] ||= rails_app.master_key
+
+      check_build_args(build_args) unless ignore_missing_args
+
       kubernetes.docker_images.each do |image|
-        next if only && image.identifier != only
+        next unless only.empty? || only.include?(image.identifier)
+        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, docker_args)
+        image.build(build_args, docker_args, context: context)
       end
     end
 
-    def push(only = nil)
+    def push(only: [])
       kubernetes.docker_images.each do |image|
-        next if only && image.identifier != only
+        next unless only.empty? || only.include?(image.identifier)
 
         image = image.current_version
         Kuby.logger.info("Pushing image #{image.image_url} with tags #{image.tags.join(', ')}")
@@ -49,21 +56,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) }
@@ -104,6 +97,18 @@ module Kuby
       puts File.read(path)
     end
 
+    def print_images
+      rows = kubernetes.docker_images.flat_map do |image|
+        image = image.current_version
+
+        image.tags.map do |tag|
+          [image.identifier, "#{image.image_url}:#{tag}"]
+        end
+      end
+
+      puts Kuby::Utils::Table.new(%w(IDENTIFIER URL), rows).to_s
+    end
+
     def kubectl(*cmd)
       kubernetes_cli.run_cmd(cmd)
     end
@@ -145,6 +150,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/utils/table.rb

@@ -0,0 +1,35 @@
+module Kuby
+  module Utils
+    class Table
+      attr_reader :headers, :rows
+
+      def initialize(headers, rows)
+        @headers = headers
+        @rows = rows
+      end
+
+      def to_s
+        [headers, *rows].map { |vals| make_row(vals) }.join("\n")
+      end
+
+      private
+
+      def make_row(values)
+        columns = values.each_with_index.map do |value, idx|
+          col_width = col_width_at(idx) + 2
+          value.ljust(col_width, ' ')
+        end
+
+        columns.join
+      end
+
+      def col_width_at(idx)
+        col_widths[idx] ||= [headers[idx].size, *rows.map { |r| r[idx].size }].max
+      end
+
+      def col_widths
+        @col_widths ||= {}
+      end
+    end
+  end
+end

data/lib/kuby/utils.rb

@@ -0,0 +1,5 @@
+module Kuby
+  module Utils
+    autoload :Table, 'kuby/utils/table'
+  end
+end

data/lib/kuby/version.rb

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

data/spec/docker/timestamped_image_spec.rb

@@ -19,8 +19,8 @@ describe Kuby::Docker::TimestampedImage do
     subject { image.current_version&.main_tag }
 
     context 'with no local or remote tags' do
-      it 'raises an error' do
-        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
+      it 'creates a new tag' do
+        expect(subject).to match(/\d{14}/)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -285,6 +285,8 @@ files:
 - lib/kuby/railtie.rb
 - lib/kuby/tasks.rb
 - lib/kuby/trailing_hash.rb
+- lib/kuby/utils.rb
+- lib/kuby/utils/table.rb
 - lib/kuby/version.rb
 - spec/docker/spec_spec.rb
 - spec/docker/timestamp_tag_spec.rb