kuby-core 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb1eba2c179a03610f3f478f595c43638e692b41ebad53c7d6292ef5699000a
-  data.tar.gz: b9003940ecba163e1f9c08100223d6059920f7f9a2d8ebff0c038e1fd5f335ee
+  metadata.gz: 5cbd792443dc33de6a20d02f6969f6d59d535f1b68fb75c9a8945615fd870a28
+  data.tar.gz: 3add1ef85d6758a2590d35d7aa0bfb4fffaeae55ef6567a34cf3b7557a56e55a
 SHA512:
-  metadata.gz: fad183f5c697c6f6a06da8984dff19e0feac91b1996ae79a6605cafb612c77590461f80807ac87854124a97eef31e2999b39a64f997ef4f0fc77564365d81602
-  data.tar.gz: 1df3f9153d1595d085511329a5c1110117fa626632438a635f162c38cbe9c48d53df3098b28300408b89021365298b9972d07bdb9abd17b01bbc236e711ed3b8
+  metadata.gz: 7d855f57aae01d93c2fa44e285ee417ebcc00f12de6f9c4b989a39626ec9ec13a4659eafe0b8924592de5d860666158376e5adbf69c70373703eb2a9074ca75d
+  data.tar.gz: dc553aa0b22e5ab262fa18fa1a60bebb421862eab7e747e06c63907fefe8f5371be56415d0bde2e959ffa775140b624aee3aa53006f1dbee272122c87bf53cc6

data/CHANGELOG.md

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

data/lib/kuby/commands.rb

@@ -67,6 +67,7 @@ module Kuby
       c.flag [:a, :arg], required: false, multiple: true
       c.switch [:'ignore-missing-args'], required: false, default: false
       c.flag [:only], required: false
+      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|
@@ -79,7 +80,8 @@ module Kuby
         tasks.build(
           build_args, docker_args,
           only: options[:only],
-          ignore_missing_args: options[:'ignore-missing-args']
+          ignore_missing_args: options[:'ignore-missing-args'],
+          context: options[:context]
         )
       end
     end

data/lib/kuby/docker/app_image.rb

@@ -20,15 +20,6 @@ module Kuby
         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/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/image.rb

@@ -116,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
 

data/lib/kuby/docker/timestamped_image.rb

@@ -31,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) }
@@ -74,9 +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)
+      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)
         @current_version = new_version
         @new_version = nil
       end
@@ -88,6 +90,13 @@ 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(

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

@@ -28,12 +28,8 @@ 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)
+        def build(build_args = {}, docker_args = [], context: nil)
+          docker_cli.build(current_version, build_args: build_args, docker_args: docker_args, context: context)
         end
 
         def push(tag)

data/lib/kuby/tasks.rb

@@ -28,8 +28,14 @@ module Kuby
       environment.kubernetes.setup
     end
 
-    def build(build_args = {}, docker_args = [], only: nil, ignore_missing_args: false)
+    def build(build_args = {}, docker_args = [], only: nil, ignore_missing_args: false, context: nil)
       check_platform(docker_args)
+
+      build_args['RAILS_MASTER_KEY'] ||= ENV['RAILS_MASTER_KEY'] || begin
+        master_key_file = File.join('config', 'master.key')
+        File.exist?(master_key_file) ? File.read(master_key_file).strip : nil
+      end
+
       check_build_args(build_args) unless ignore_missing_args
 
       kubernetes.docker_images.each do |image|
@@ -39,7 +45,7 @@ module Kuby
 
         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
 

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.16.1'.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.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize