bankai-docker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d314159811ac96d23c11e0d76fc8be0a25725d777842c2dc2712cde62d71e8c
-  data.tar.gz: 36069b1bb2fd5776527009ed0bcd504a998ebdc70c81084607b735c82fddd716
+  metadata.gz: f68fe68004c5ab50af0785203a2ae80a7488ec2fea15e70c8ec1adbac9d174c5
+  data.tar.gz: e69ba33eb18f3695bff08aac0871d867eeca02f1e983ad840323800f4a0c5e02
 SHA512:
-  metadata.gz: 32e12d710314698a8de918bc92b18a6f0c79bfc8e28551e9b0c3fa18c3e63fbe999765a7c08852f9f29020367fa805de9de4377b72da07c698f3ec4b24de23ef
-  data.tar.gz: e2cd532fb98f4b6fad37a795a3ea438dfcb93fa3fab8dbe404205e107d5649743fbaf2143c6c9cdbe43f72e3fbc4c8c55cdf1f8e3d5c3f1677d261a2bf821caa
+  metadata.gz: 67d7845371f2afa3218c24e1923542aa6a1eff76999881e40317aa2503213866a00543adb1e0389f95386de53357f940a0ab42c03b90fcb45c60f2eabba87abd
+  data.tar.gz: 84d8ec996eba867ed4f2ceb3e8f4bedf7fac8b51667a95518ec75b86bbc10f7c821361d4e9b07da97f5abae640b38190514489beb6476db85cda78ee345fbda3

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 
 coverage/
+
+Gemfile.lock

data/README.md

@@ -43,12 +43,13 @@ vim config/docker.rb
 
 * [ ] Auto detect Dockerfile
 * [ ] Auto detect .dockerignore
-* [ ] Auto package install detect from Gemfile
+* [x] Auto package install detect from Gemfile
 * [ ] DSL
   * [ ] Gem Install
   * [ ] Specify Ruby/Node Version
-  * [ ] Package Install
-  * [ ] Rails Commands
+  * [x] Package Install
+  * [ ] Bundle / Rake / Rails Commands
+  * [x] Auto `COPY --from` rules
 
 ## Development
 

data/lib/bankai/docker.rb

@@ -2,9 +2,11 @@ require 'bankai/docker/version'
 require 'bankai/docker/generators/install'
 require 'bankai/docker/railtie'
 require 'bankai/docker/dsl'
+require 'bankai/docker/package'
 require 'bankai/docker/file'
 require 'bankai/docker/stage'
 require 'bankai/docker/command'
+require 'bankai/docker/copy'
 
 module Bankai
   # :nodoc:

data/lib/bankai/docker/builder.rb

@@ -77,14 +77,13 @@ module Bankai
       private
 
       def cache_options
-        @cache_options = @layers.map do |target|
-          "--cache-from #{@name}:#{target}"
+        @cache_options = File.stages.map do |_, stage|
+          "--cache-from #{stage.tag}"
         end.join(' ')
       end
 
       def install_build_tasks
-        @layers.each do |target|
-          stage = File.stages[target]
+        File.stages.each do |target, stage|
           task target, :name do |_, args|
             File.instance.update_name(args[:name])
             @name ||= File.name

data/lib/bankai/docker/copy.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module Bankai
+  module Docker
+    # The generated files copy manager
+    class Copy
+      include Singleton
+
+      class << self
+        def add(stage, source, destination)
+          instance.add(stage, source, destination)
+        end
+
+        def to_s
+          instance.to_s
+        end
+      end
+
+      def initialize
+        @items = {}
+      end
+
+      def add(stage, source, destination)
+        stage = stage.to_sym
+        @items[stage] ||= []
+        @items[stage] << [source, destination]
+      end
+
+      def to_s
+        @items.flat_map do |stage, items|
+          items.uniq.map do |source, destination|
+            "COPY --from=#{stage} #{source} #{destination}"
+          end
+        end.join("\n")
+      end
+    end
+  end
+end

data/lib/bankai/docker/dsl.rb

@@ -3,3 +3,4 @@
 require_relative 'dsl/argument'
 require_relative 'dsl/name'
 require_relative 'dsl/commands'
+require_relative 'dsl/gemfile'

data/lib/bankai/docker/dsl/commands.rb

@@ -42,6 +42,22 @@ module Bankai
         def volume(*volumes)
           command 'volume', *volumes, mode: :array
         end
+
+        def package(*packages, runtime: true)
+          Package.use(@name) do |instance|
+            instance.add_dependency(*packages, runtime: runtime)
+          end
+        end
+
+        def runtime_package(*packages)
+          Package.instance.add_runtime_dependency(*packages)
+        end
+
+        def package_command
+          return unless Package.any?(@name)
+
+          "RUN #{Package.command_for @name}"
+        end
       end
     end
   end

data/lib/bankai/docker/dsl/gemfile.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Bankai
+  module Docker
+    module DSL
+      # Gemfile detect
+      module Gemfile
+        def pg?
+          gemfile.match?(/gem .pg./)
+        end
+
+        def mysql?
+          gemfile.match?(/gem .mysql2./)
+        end
+
+        def gem?(name)
+          gemfile.match?(/gem .#{name}./)
+        end
+
+        private
+
+        def gemfile
+          @gemfile ||= ::File.read(Rails.root.join('Gemfile'))
+        end
+      end
+    end
+  end
+end

data/lib/bankai/docker/file.rb

@@ -33,6 +33,7 @@ module Bankai
       include Singleton
       include DSL::Name
       include DSL::Argument
+      include DSL::Gemfile
 
       attr_reader :stages
 
@@ -60,12 +61,27 @@ module Bankai
         @stages[:main] = Stage.new(:main, from: from, &block)
       end
 
+      def package(stage, *packages, runtime: true)
+        Package.use(stage) do |instance|
+          instance.add_dependency(*packages, runtime: runtime)
+        end
+      end
+
+      def runtime_package(*packages)
+        Package.instance.add_runtime_dependency(*packages)
+      end
+
+      def detect_package(name, stage, &block)
+        Package.register(name, stage, &block)
+      end
+
       def update_name(default = nil)
         app_name = Rails.app_class.parent_name.demodulize.underscore.dasherize
         @name = @name || default || "#{`whoami`.chomp}/#{app_name}"
       end
 
       def to_s
+        Package.detect
         root = Bankai::Docker::Generators::Base.default_source_root
         template = ERB.new(::File.read("#{root}/dockerfile.erb"), nil, '-')
         template.result(binding)

data/lib/bankai/docker/package.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module Bankai
+  module Docker
+    # The package manager
+    class Package
+      class << self
+        def use(name, &block)
+          instance.switch(name, &block)
+        end
+
+        def register(name, stage, &block)
+          instance.register(name, stage, &block)
+        end
+
+        def detect
+          instance.detect
+        end
+
+        def any?(name)
+          !instance.stages[name.to_sym].nil?
+        end
+
+        def command_for(name)
+          format(
+            instance.command,
+            packages: (instance.stages[name.to_sym] || []).uniq.join(' ')
+          )
+        end
+      end
+
+      include Singleton
+
+      attr_reader :stages, :command
+
+      def initialize
+        # TODO: Support more package manager
+        @command = 'apk add --no-cache %<packages>s'
+        @mutex = Mutex.new
+        @stages = {}
+        @autos = {}
+
+        @current_stage = :main
+      end
+
+      def add_dependency(*packages, runtime: true)
+        current_stage.concat(packages)
+        stage(:main).concat(packages) if runtime
+      end
+
+      def add_runtime_dependency(*packages)
+        stage(:main).concat(packages)
+      end
+
+      def switch(stage_name, &_block)
+        prev = @current_stage
+        @mutex.synchronize do
+          @current_stage = stage_name.to_s
+          yield self
+          @current_stage = prev
+        end
+      end
+
+      def current_stage
+        stage(@current_stage)
+      end
+
+      def register(name, stage, &block)
+        @autos[name.to_sym] = [stage.to_sym, block]
+      end
+
+      def detect
+        @autos.each do |_, (stage, fn)|
+          switch(stage, &fn)
+        end
+      end
+
+      def stage(name)
+        name = name.to_sym
+        @stages[name] ||= []
+        @stages[name]
+      end
+    end
+  end
+end

data/lib/bankai/docker/stage.rb

@@ -25,7 +25,9 @@ module Bankai
         @index = main? ? 999 : Stage.next_index
         @commands = []
         @arguments = {}
-        instance_eval(&block)
+        @block = block
+        @mutex = Mutex.new
+        @executed = false
       end
 
       def tag
@@ -49,10 +51,32 @@ module Bankai
       end
 
       def to_s
+        ensure_executed
         root = Bankai::Docker::Generators::Base.default_source_root
         template = ERB.new(::File.read("#{root}/stage.erb"), nil, '-')
         template.result(binding)
       end
+
+      def produce(source, destination = nil)
+        Copy.add(@name, source, destination || source)
+      end
+
+      def copies
+        return unless main?
+
+        Copy.to_s
+      end
+
+      private
+
+      def ensure_executed
+        return if @executed
+
+        @mutex.synchronize do
+          instance_eval(&@block)
+          @executed = true
+        end
+      end
     end
   end
 end

data/lib/bankai/docker/tasks/all.rake

@@ -3,6 +3,8 @@
 require 'bankai/docker'
 require 'bankai/docker/builder'
 
+load "#{Bankai::Docker::Generators::Base.default_source_root}/auto_package.rb"
+
 config = Rails.root.join('config', 'docker.rb')
 if config.exist?
   load config

data/lib/bankai/docker/version.rb

@@ -1,5 +1,5 @@
 module Bankai
   module Docker
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/templates/auto_package.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+Bankai::Docker.setup do
+  detect_package :database, :gem do |package|
+    if pg?
+      package.add_dependency 'postgresql-dev', runtime: false
+      package.add_runtime_dependency 'postgresql-libs'
+    end
+
+    if mysql?
+      package.add_dependency 'mariadb-dev', runtime: false
+      package.add_runtime_dependency 'mariadb-client-libs'
+    end
+
+    if gem?('sassc')
+      package.add_runtime_dependency 'libstdc++'
+    end
+  end
+end

data/templates/default.rb

@@ -2,9 +2,11 @@
 
 # rubocop:disable Metrics/BlockLength
 Bankai::Docker.setup do
+  runtime_package 'tzdata', 'libstdc++', 'git'
+
   stage :gem do
-    run 'apk add --no-cache build-base ca-certificates zlib-dev',
-        'libressl-dev postgresql-dev'
+    package 'build-base', 'ca-certificates', 'zlib-dev', 'libressl-dev',
+            runtime: false
 
     run 'mkdir -p /src/app'
 
@@ -14,37 +16,30 @@ Bankai::Docker.setup do
     workdir '/src/app'
     run 'bundle install --deployment --without development test ' \
         '--no-cache --clean && rm -rf vendor/bundle/ruby/**/cache'
+
+    produce '/src/app/vendor/bundle'
+    produce '/usr/local/bundle/config'
   end
 
   stage :node, from: 'node:10.15.2-alpine' do
     run 'mv /opt/yarn-v${YARN_VERSION} /opt/yarn'
+
+    produce '/usr/local/bin/node'
+    produce '/opt/yarn'
   end
 
   main do
-    # Requirements
-    # node - libstdc++
-    # yarn - git
-    run 'apk add --no-cache tzdata postgresql-libs libstdc++ libcurl git'
     run 'mkdir -p /src/app'
 
-    copy '/usr/local/bin/node', '/usr/local/bin/', from: :node
-    copy '/opt/yarn', '/opt/yarn', from: :node
-
     env 'PATH=/opt/yarn/bin:/src/app/bin:$PATH'
+    env 'RAILS_ENV=production'
 
     add '.', '/src/app'
-
-    copy '/src/app/vendor/bundle', '/src/app/vendor/bundle', from: :gem
-    copy '/usr/local/bundle/config', '/usr/local/bundle/config', from: :gem
-
     workdir '/src/app'
 
-    env 'RAILS_ENV=production'
-    run 'rails app:update:bin && rm -rf /src/app/tmp'
-
     expose 80
 
-    entrypoint './bin/docker-entrypoint'
+    entrypoint 'docker-entrypoint'
     cmd 'serve'
   end
 end

data/templates/stage.erb

@@ -1,7 +1,9 @@
-FROM <%= @from %><%= @name == :main ? '' : " AS #{@name}" %>
-<% @arguments.each do |name, value| -%>
+FROM <%= @from %><%= main? ? '' : " AS #{@name}" %>
+<% @arguments.each do |name, value| %>
 ARG <%= name %><%= value.nil? ? '' : "=#{value}" %>
-<% end %>
-<%- @commands.each do |command| -%>
+<% end -%>
+<%= package_command %>
+<%= copies %>
+<% @commands.each do |command| -%>
 <%= command %>
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bankai-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 5xRuby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bankai-docker.gemspec
@@ -146,18 +145,22 @@ files:
 - lib/bankai/docker.rb
 - lib/bankai/docker/builder.rb
 - lib/bankai/docker/command.rb
+- lib/bankai/docker/copy.rb
 - lib/bankai/docker/dsl.rb
 - lib/bankai/docker/dsl/argument.rb
 - lib/bankai/docker/dsl/commands.rb
+- lib/bankai/docker/dsl/gemfile.rb
 - lib/bankai/docker/dsl/name.rb
 - lib/bankai/docker/file.rb
 - lib/bankai/docker/generators/base.rb
 - lib/bankai/docker/generators/install.rb
+- lib/bankai/docker/package.rb
 - lib/bankai/docker/railtie.rb
 - lib/bankai/docker/stage.rb
 - lib/bankai/docker/tasks/all.rake
 - lib/bankai/docker/tasks/build.rake
 - lib/bankai/docker/version.rb
+- templates/auto_package.rb
 - templates/default.rb
 - templates/dockerfile.erb
 - templates/entrypoint.erb

data/Gemfile.lock

@@ -1,182 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bankai-docker (0.1.0)
-      bankai
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
-      globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    bankai (0.2.2)
-      rails (= 5.2.2)
-    builder (3.2.3)
-    bundler-audit (0.6.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.8.0)
-    ffi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    iniparse (1.4.4)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
-    loofah (2.2.3)
-      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 (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    overcommit (0.46.0)
-      childprocess (~> 0.6, >= 0.6.3)
-      iniparse (~> 1.4)
-    parallel (1.14.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.60.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bankai-docker!
-  bundler (~> 1.17)
-  bundler-audit
-  overcommit
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.60.0)
-  simplecov
-
-BUNDLED WITH
-   1.17.3