kuby-core 0.11.16 → 0.15.0

data/lib/kuby/kubernetes/spec.rb

@@ -72,7 +72,7 @@ module Kuby
       end
 
       def before_deploy
-        @tag ||= docker.tag
+        @tag ||= docker.image.current_version.main_tag
 
         provider.before_deploy(resources)
         @plugins.each { |_, plg| plg.before_deploy(resources) }
@@ -81,7 +81,7 @@ module Kuby
       end
 
       def after_deploy
-        @tag ||= docker.tag
+        @tag ||= docker.image.current_version.main_tag
 
         @plugins.each { |_, plg| plg.after_deploy(resources) }
         provider.after_deploy(resources)
@@ -144,24 +144,22 @@ module Kuby
       def registry_secret(&block)
         spec = self
 
-        unless environment.development?
-          @registry_secret ||= RegistrySecret.new do
-            metadata do
-              name "#{spec.selector_app}-registry-secret"
-              namespace spec.namespace.metadata.name
-            end
-
-            docker_config do
-              registry_host spec.docker.metadata.image_hostname
-              username spec.docker.credentials.username
-              password spec.docker.credentials.password
-              email spec.docker.credentials.email
-            end
+        @registry_secret ||= RegistrySecret.new do
+          metadata do
+            name "#{spec.selector_app}-registry-secret"
+            namespace spec.namespace.metadata.name
           end
 
-          @registry_secret.instance_eval(&block) if block
-          @registry_secret
+          docker_config do
+            registry_host spec.docker.image.image_hostname
+            username spec.docker.image.credentials.username
+            password spec.docker.image.credentials.password
+            email spec.docker.image.credentials.email
+          end
         end
+
+        @registry_secret.instance_eval(&block) if block
+        @registry_secret
       end
 
       def resources
@@ -172,6 +170,12 @@ module Kuby
         ].compact)
       end
 
+      def docker_images
+        @docker_images ||= [
+          docker.image, *@plugins.flat_map { |_, plugin| plugin.docker_images }
+        ]
+      end
+
       def selector_app
         @selector_app ||= environment.app_name.downcase
       end

data/lib/kuby/plugin.rb

@@ -21,8 +21,8 @@ module Kuby
       []
     end
 
-    # additional dockerfiles that should be built and pushed
-    def dockerfiles
+    # additional docker images that should be built and pushed
+    def docker_images
       []
     end
 

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

@@ -47,38 +47,6 @@ module Kuby
           end
         end
 
-        def configure_deployment(deployment, docker_image)
-          spec = self
-
-          deployment.spec.template.spec do
-            init_container(:copy_assets) do
-              name "#{spec.selector_app}-copy-assets"
-              command %w(bundle exec rake kuby:rails_app:assets:copy)
-              image docker_image
-
-              volume_mount do
-                name 'assets'
-                mount_path RAILS_MOUNT_PATH
-              end
-            end
-
-            container(:web) do
-              volume_mount do
-                name 'assets'
-                mount_path NGINX_MOUNT_PATH
-              end
-            end
-
-            volume do
-              name 'assets'
-
-              persistent_volume_claim do
-                claim_name spec.volume_claim.metadata.name
-              end
-            end
-          end
-        end
-
         def copy_task
           @copy_task ||= AssetCopyTask.new(
             from: asset_path, to: RAILS_MOUNT_PATH
@@ -238,7 +206,7 @@ module Kuby
                   container(:nginx) do
                     name "#{kube_spec.selector_app}-#{kube_spec.role}"
                     image_pull_policy 'IfNotPresent'
-                    image NGINX_IMAGE
+                    image "#{kube_spec.image.image_url}:#{kube_spec.kubernetes.tag || Kuby::Docker::LATEST_TAG}-assets"
 
                     port do
                       container_port NGINX_PORT
@@ -252,11 +220,6 @@ module Kuby
                       sub_path 'nginx.conf'
                     end
 
-                    volume_mount do
-                      name 'assets'
-                      mount_path NGINX_MOUNT_PATH
-                    end
-
                     readiness_probe do
                       success_threshold 1
                       failure_threshold 2
@@ -272,6 +235,10 @@ module Kuby
                     end
                   end
 
+                  image_pull_secret do
+                    name kube_spec.environment.kubernetes.registry_secret.metadata.name
+                  end
+
                   volume do
                     name 'nginx-config'
 
@@ -280,14 +247,6 @@ module Kuby
                     end
                   end
 
-                  volume do
-                    name 'assets'
-
-                    persistent_volume_claim do
-                      claim_name kube_spec.volume_claim.metadata.name
-                    end
-                  end
-
                   restart_policy 'Always'
                   service_account_name kube_spec.service_account.metadata.name
                 end
@@ -299,38 +258,19 @@ module Kuby
           @deployment
         end
 
-        def volume_claim
-          spec = self
-
-          @volume_claim ||= KubeDSL.persistent_volume_claim do
-            metadata do
-              name "#{spec.selector_app}-#{spec.role}"
-              namespace spec.namespace.metadata.name
-            end
-
-            spec do
-              access_modes ['ReadWriteOnce']
-              storage_class_name spec.environment.kubernetes.provider.storage_class_name
-
-              resources do
-                requests do
-                  add :storage, '10Gi'
-                end
-              end
-            end
-          end
-        end
-
         def resources
           @resources ||= [
             service,
             service_account,
             nginx_config,
-            deployment,
-            volume_claim
+            deployment
           ]
         end
 
+        def docker_images
+          @docker_images ||= [docker_spec]
+        end
+
         def namespace
           environment.kubernetes.namespace
         end
@@ -342,6 +282,58 @@ module Kuby
         def role
           ROLE
         end
+
+        def docker
+          environment.docker
+        end
+
+        def kubernetes
+          environment.kubernetes
+        end
+
+        def docker_images
+          @docker_images ||= [image]
+        end
+
+        def image
+          @image ||= RailsApp::AssetsImage.new(docker.image, -> { dockerfile }, docker.image.registry_index_url)
+        end
+
+        private
+
+        def dockerfile
+          Docker::Dockerfile.new.tap do |df|
+            base_image = docker.image.current_version
+            cur_tag = base_image.main_tag
+            app_name = environment.app_name.downcase
+
+            tags = begin
+              [base_image.previous_timestamp_tag(cur_tag).to_s, cur_tag]
+            rescue Kuby::Docker::MissingTagError
+              [cur_tag, nil]
+            end
+
+            # this can handle more than 2 tags by virtue of using each_cons :)
+            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("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("env RAILS_MASTER_KEY=$RAILS_MASTER_KEY bundle exec rake kuby:rails_app:assets:copy")
+              end
+            end
+
+            df.from(NGINX_IMAGE)
+            df.copy("--from=#{"#{app_name}-#{tags.compact.last}"} #{RAILS_MOUNT_PATH}", NGINX_MOUNT_PATH)
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,57 @@
+module Kuby
+  module Plugins
+    module RailsApp
+      class AssetsImage < ::Kuby::Docker::Image
+        attr_reader :base_image
+
+        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
+          # here. There can be no asset image without a base image.
+          current_version
+        end
+
+        def current_version
+          @current_version ||= duplicate_with_annotated_tags(
+            base_image.current_version
+          )
+        end
+
+        def previous_version
+          @previous_version ||= duplicate_with_annotated_tags(
+            base_image.previous_version
+          )
+        end
+
+        def build(build_args = {}, docker_args = [])
+          docker_cli.build(current_version, build_args: build_args, docker_args: docker_args)
+        end
+
+        def push(tag)
+          docker_cli.push(image_url, tag)
+        end
+
+        private
+
+        def duplicate_with_annotated_tags(image)
+          self.class.new(
+            base_image,
+            dockerfile,
+            registry_index_url,
+            annotate_tag(image.main_tag),
+            image.alias_tags.map { |at| annotate_tag(at) }
+          )
+        end
+
+        def annotate_tag(tag)
+          "#{tag}-assets"
+        end
+      end
+    end
+  end
+end

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