kuby-core 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a443b66d4dff19f6a2112b6365a9579b0490b049ef51ab612ad9e6cf4a807901
-  data.tar.gz: 2b38151be094c758a64ecdc95c585f184f4e9eea1affbdc4d071cc7a20d499a0
+  metadata.gz: 3b6d5377f043be7d0aa02cddf817a9dd7fdbaa500c2ed94a2fdb92fa7ef0c1cc
+  data.tar.gz: 57c6cb1a15c4385a7675a05637dbfd085e2b2f438f5429104ec66203e854dd68
 SHA512:
-  metadata.gz: 6cf93a88bc24ab142fa497daddc7227d417c138391f46db6f5b77a862c96e9c2733d880eded21d464170963902364ac0f2806f84cd083d0a5b408231987bcf2b
-  data.tar.gz: dab2dcd180ff19421ef44aef1a3384e1faa0b49511925e6557d54500a652a5c854217a8c463cd738cd6a745b2eb1804262e35539635fdb4d98ed13d2abc90aa2
+  metadata.gz: 9c903b0768473d63df1a3ddb9ee3146193abad9c809614f7ccd2e7b7c711a2a3effd3810a3b67780ee68ea3198b8770099fcb3fd4d2a334b39b664f59b8e9e8f
+  data.tar.gz: 69fc8934c14181930c03d3d3ffe050e2da0a85edbbd2f5bba38bf0509131149c643ea42577afcec3a4625057eab52f57bab1e00c3271bedcf491d2e11f1ae696

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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)

data/lib/kuby/commands.rb

@@ -65,23 +65,25 @@ 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.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, options[:only])
       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(options[:only])
       end
     end
 
@@ -94,8 +96,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(options[:only])
       end
     end
 
@@ -117,8 +120,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
 

data/lib/kuby/docker/app_image.rb

@@ -6,13 +6,27 @@ 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,
+          main_tag: T.nilable(String),
+          alias_tags: T::Array[String]
+        ).void
+      }
+      def initialize(dockerfile, image_url, credentials, 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/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/image.rb

@@ -5,6 +5,9 @@ module Kuby
     class Image
       extend T::Sig
 
+      sig { returns(T.nilable(String)) }
+      attr_reader :identifier
+
       sig { returns(String) }
       attr_reader :image_url
 
@@ -32,6 +35,7 @@ module Kuby
         @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))
@@ -89,8 +93,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
 

data/lib/kuby/docker/timestamped_image.rb

@@ -73,9 +73,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

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

@@ -317,14 +317,15 @@ 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.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

@@ -7,6 +7,7 @@ module Kuby
         def initialize(base_image, dockerfile, main_tag = nil, alias_tags = [])
           super(dockerfile, base_image.image_url, base_image.credentials, main_tag, alias_tags)
           @base_image = base_image
+          @identifier = "assets"
         end
 
         def new_version
@@ -27,8 +28,8 @@ module Kuby
           )
         end
 
-        def build(build_args = {})
-          docker_cli.build(current_version, build_args: build_args)
+        def build(build_args = {}, docker_args = [])
+          docker_cli.build(current_version, build_args: build_args, docker_args: docker_args)
         end
 
         def push(tag)

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,20 @@ module Kuby
       environment.kubernetes.setup
     end
 
-    def build(build_args = {})
+    def build(build_args = {}, docker_args = [], only = nil)
       kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
+
         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)
@@ -77,10 +84,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

data/lib/kuby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize