boxing 0.4.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3d343131564fde7cf4de0e29e3ef500be4107eee0893855473f6efc958eaf5
-  data.tar.gz: a2d34fe4ce57859dc44b20ddcd77026f07f24ea25b77d54a15ab6980c1d06817
+  metadata.gz: bc21028b8c1cec59fa65a7625960e5148558949307af4ca0a67c113de3c13384
+  data.tar.gz: f31e60e67183097d525671bf03314083e0f0616a4d6069c87005fbc5c069fd29
 SHA512:
-  metadata.gz: 37e4a71b5784d2226b0ce46267f299b968a0307930eea655303c1050d7861fcc9ece58e50f8018ac10e243258b22b96e12261a5ff91b99f95c1d9b403643957d
-  data.tar.gz: 20ec4384c3be3fbd1f904cd1911aab41c95aa100f1cef6f243a245b1697865131e114ef878a31fca4f88e6f5119edf558986d2c9a669e05a5be1060b65b3f90e
+  metadata.gz: 0eddac800256df2f53666810539c6347703274bde008d7043309d096b27a7c083fd96a6ab854a84c0354b8387532689a8cc612da06ed310cc6a5c97b0f3d73ff
+  data.tar.gz: de2c527ba2ce831900bf5942872b169faae0cb0b5fb4f931fecc7083745a7f5ab5b3631ce0f40380efeb5e0e650c2d7d8695c123aa019a613c267f6b593e1713

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boxing (0.4.1)
+    boxing (0.6.2)
       bundler (~> 2.0)
       thor (~> 1.0)
 

data/README.md

@@ -78,18 +78,86 @@ bundle exec boxing update
 
 > If the generated `Dockerfile` is not satisfy, please try to update it.
 
+## Configuration
+
+If `config/boxing.rb` is found, it will be loaded and change the generated `Dockerfile` and `.dockerignore`
+
+### Source Code Root
+
+```ruby
+Boxing.config do |c|
+  c.root = '/var/www'
+end
+```
+
+### Ignore Files
+
+```ruby
+Boxing.config do |c|
+  c.ignores = %w[
+    vendor/gems
+  ]
+end
+```
+
+### Extra Packages
+
+```ruby
+Boxing.config do |c|
+  c.build_packages = %w[nodejs]
+  c.runtime_packages = %w[git]
+end
+```
+
+### Assets Precompile
+
+This feature is disabled by default and suggest to use CI to build it.
+
+```ruby
+Boxing.config do |c|
+  c.assets_precompile = true
+  # If not given the `node -v` will be execute
+  c.node_version = '14.18'
+end
+```
+
+### Health Check
+
+```ruby
+Boxing.config do |c|
+  c.health_check = true
+  c.health_check_path = '/api/status.json'
+end
+```
+
+> If `liveness` gem is installed, the health check will enabled by default with `/status` path.
+
 ## Roadmap
 
 * [x] `Dockerfile` generator
-* [x] `.gitignore` generator
+* [x] `.dockerignore` generator
   * [x] Common ignore files
-  * [ ] Customizable ignore files
-* [ ] Customize config file `config/boxing.rb`
-* [ ] Entrypoint Detection
-  * [x] Openbox (Suggested)
+  * [x] Customizable ignore files
+* [ ] Docker Compose generator
+  * [ ] Production Version
+  * [x] Development Version
+* [x] Allow run Assets Precompile in Container
+  * [ ] Disable `RAILS_SERVE_STATIC_FILES` by default
+* [x] Customize config file `config/boxing.rb`
+  * [x] Customize `APP_ROOT`
+  * [ ] Extra packages
+  * [ ] DSL to customize `Dockerfile`
+    * [ ] Build Stage
+    * [ ] Entrypoint
+    * [ ] Command
+    * [x] Expose Port
+* [x] Health Check
+  * [x] [Liveness](https://github.com/elct9620/openbox) gem detection
+  * [x] Add `curl` for web application
+* [x] Entrypoint Detection
+  * [x] [Openbox](https://github.com/elct9620/openbox) (Suggested)
   * [x] Ruby on Rails
-  * [ ] Rack
-  * [ ] Ruby
+  * [x] Rack (Default)
 * [ ] Package Database
   * [x] Built-in (Move to standalone repoistory in future)
   * [x] Standalone Repoistory

data/lib/boxing/command.rb

@@ -12,7 +12,9 @@ module Boxing
       true
     end
 
+    require_relative 'commands/base'
     require_relative 'commands/generate'
+    require_relative 'commands/compose'
     require_relative 'commands/update'
   end
 end

data/lib/boxing/commands/base.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Boxing
+  # :nodoc:
+  module Commands
+    # The Base Command
+    #
+    # @since 0.5.0
+    class Base < Thor::Group
+      include Thor::Actions
+
+      # :nodoc:
+      def self.source_root
+        Pathname.new(File.dirname(__FILE__)).join('../../..')
+      end
+
+      # Prepare command environment
+      #
+      # @since 0.5.0
+      def prepare
+        config = Bundler.root.join('config/boxing.rb')
+        return unless config.exist?
+
+        load config
+      end
+
+      private
+
+      # :nodoc:
+      def context
+        @context = Context.new(
+          Boxing.config,
+          Database.new,
+          Boxing.dependencies
+        )
+      end
+    end
+  end
+end

data/lib/boxing/commands/compose.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Boxing
+  # :nodoc:
+  module Commands
+    # The Docker Compose Generator
+    #
+    # @since 0.1.0
+    class Compose < Base
+      # Create Dockerfile
+      #
+      # @since 0.1.0
+      def execute
+        Database.download! unless Database.exist?
+
+        # TODO: Allow set image registry
+        # TODO: Allow set application name
+        template('templates/docker-compose.yml.tt', 'docker-compose.yml', context: context.to_binding)
+      end
+    end
+
+    Boxing::Command.register(Compose, 'compose', 'compose', 'Generate docker-compose.yml')
+  end
+end

data/lib/boxing/commands/generate.rb

@@ -9,14 +9,7 @@ module Boxing
     # The Dockerfle Generator
     #
     # @since 0.1.0
-    class Generate < Thor::Group
-      include Thor::Actions
-
-      # :nodoc:
-      def self.source_root
-        Pathname.new(File.dirname(__FILE__)).join('../../..')
-      end
-
+    class Generate < Base
       # Create Dockerfile
       #
       # @since 0.1.0
@@ -26,15 +19,6 @@ module Boxing
         template('templates/Dockerfile.tt', 'Dockerfile', context: context.to_binding)
         template('templates/dockerignore.tt', '.dockerignore', context: context.to_binding)
       end
-
-      private
-
-      def context
-        @context = Context.new(
-          Database.new,
-          Boxing.dependencies
-        )
-      end
     end
 
     Boxing::Command.register(Generate, 'generate', 'generate', 'Generate Dockerfile')

data/lib/boxing/commands/update.rb

@@ -6,7 +6,7 @@ module Boxing
     # The Database Updater
     #
     # @since 0.3.0
-    class Update < Thor::Group
+    class Update < Base
       # Update Database
       #
       # @since 0.3.0

data/lib/boxing/config.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Boxing
+  # The config of boxing
+  #
+  # @since 0.5.0
+  class Config
+    # @!attribute root
+    #   @return [String] the application root
+    #
+    # @since 0.5.0
+    attr_accessor :root, :name, :registry, :ignores, :port,
+                  :health_check, :health_check_path,
+                  :assets_precompile, :node_version,
+                  :build_packages, :runtime_packages
+
+    # @since 0.5.0
+    def initialize(&block)
+      @name = 'myapp'
+      @root = '/srv/app'
+      @port = 9292
+      @health_path = '/status'
+      @assets_precompile = false
+
+      instance_exec(self, &block) if defined?(yield)
+    end
+  end
+end

data/lib/boxing/context.rb

@@ -5,13 +5,20 @@ module Boxing
   #
   # @since 0.1.0
   class Context
+    # @since 0.5.0
+    attr_reader :config
+
+    # @param config [Boxing::Config]
     # @param database [Boxing::Database]
     # @param dependencies [Array<Bundler::Dependency>]
     #
     # @since 0.1.0
-    def initialize(database, dependencies = [])
+    def initialize(config, database, dependencies = [])
+      @config = config
       @database = database
       @dependencies = dependencies
+
+      @config.port = 3000 if has?('rails')
     end
 
     # Return required packages
@@ -22,7 +29,7 @@ module Boxing
     def packages
       @packages ||=
         Set
-        .new(default_packages)
+        .new(default_packages + extra_packages)
         .merge(
           @dependencies
           .map(&:name)
@@ -60,9 +67,35 @@ module Boxing
         Package.new('build-base', mode: Package::BUILD)
       ]
         .push(git? ? Package.new('git', mode: Package::BUILD) : nil)
+        .push(has?('liveness') ? Package.new('curl', mode: Package::RUNTIME) : nil)
         .compact
     end
 
+    # Extra Packages
+    #
+    # @return [Array<Boxing::Package>]
+    #
+    # @since 0.6.0
+    def extra_packages
+      Array[config.build_packages, config.runtime_packages].compact.flat_map do |name|
+        mode = 0
+        mode |= Package::BUILD if config.build_packages&.include?(name)
+        mode |= Package::RUNTIME if config.runtime_packages&.include?(name)
+        Package.new(name, mode: mode)
+      end
+    end
+
+    # Return node.js version
+    #
+    # @return [String]
+    #
+    # @since 0.6.0
+    def node_version
+      return config.node_version if config.node_version
+
+      `node -v`.gsub(/^v/, '')
+    end
+
     # Convert to binding
     #
     # @return [Binding]

data/lib/boxing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Boxing
-  VERSION = '0.4.1'
+  VERSION = '0.6.2'
 end

data/lib/boxing.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'boxing/version'
+require_relative 'boxing/config'
 require_relative 'boxing/package'
 require_relative 'boxing/database'
 require_relative 'boxing/context'
@@ -10,6 +11,8 @@ require_relative 'boxing/command'
 #
 # @since 0.1.0
 module Boxing
+  LOCK = Mutex.new
+
   module_function
 
   # @return [Bundler::Dependency]
@@ -21,4 +24,19 @@ module Boxing
       .current_dependencies
       .select { |dep| (dep.groups & groups).any? }
   end
+
+  # @return [Boxing::Config]
+  #
+  # @since 0.5.0
+  def config(&block)
+    return @config if @config
+
+    LOCK.synchronize do
+      return @config if @config
+
+      @config = Config.new(&block)
+    end
+
+    @config
+  end
 end

data/templates/Dockerfile.tt

@@ -1,5 +1,6 @@
-ARG APP_ROOT=/src/app
+ARG APP_ROOT=<%= config.root %>
 ARG RUBY_VERSION=<%= RUBY_VERSION %>
+<%- if config.assets_precompile -%>ARG NODE_VERSION=<%= node_version %><%- end -%>
 
 FROM ruby:${RUBY_VERSION}-alpine AS gem
 ARG APP_ROOT
@@ -23,6 +24,29 @@ RUN gem install bundler:<%= Bundler::VERSION %> \
     && find /usr/local/bundle -type f -name '*.o' -delete \
     && rm -rf /usr/local/bundle/cache/*.gem
 
+<%- if config.assets_precompile -%>
+FROM node:${NODE_VERSION}-alpine as node
+FROM ruby:${RUBY_VERSION}-alpine as assets
+ARG APP_ROOT
+
+<%- if packages.select(&:runtime?).any? -%>
+RUN apk add --no-cache <%= packages.select(&:runtime?).join(' ') %> yarn
+
+<%- end -%>
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+
+COPY --from=gem /usr/local/bundle/config /usr/local/bundle/config
+COPY --from=gem /usr/local/bundle /usr/local/bundle
+COPY --from=gem /${APP_ROOT}/vendor/bundle /${APP_ROOT}/vendor/bundle
+
+RUN mkdir -p ${APP_ROOT}
+COPY . ${APP_ROOT}
+
+ENV RAILS_ENV production
+WORKDIR ${APP_ROOT}
+RUN bundle exec rake assets:precompile
+
+<%- end -%>
 FROM ruby:${RUBY_VERSION}-alpine
 ARG APP_ROOT
 
@@ -39,10 +63,13 @@ RUN mkdir -p ${APP_ROOT}
 <%- if has?('rails') -%>
 ENV RAILS_ENV=production
 ENV RAILS_LOG_TO_STDOUT=true
+ENV RAILS_SERVE_STATIC_FILES=yes
 <%- end -%>
 ENV APP_ROOT=$APP_ROOT
 
 COPY . ${APP_ROOT}
+<%- if config.assets_precompile -%>COPY --from=assets /${APP_ROOT}/public /${APP_ROOT}/public
+<%- end -%>
 
 ARG REVISION
 ENV REVISION $REVISION
@@ -60,7 +87,10 @@ RUN adduser -h ${APP_ROOT} -D -s /bin/nologin ruby ruby && \
 USER ruby
 WORKDIR ${APP_ROOT}
 
-EXPOSE <%= has?('rails') ? '3000' : '9292' %>
+EXPOSE <%= config.port %>
+<%- if has?('liveness') || config.health_check -%>
+HEALTHCHECK CMD curl -f http://localhost:<%= config.port %><%= config.health_check_path %> || exit 1
+<%- end -%>
 <%- if has?('openbox') -%>
 ENTRYPOINT ["bin/openbox"]
 CMD ["server"]

data/templates/docker-compose.yml.tt

@@ -0,0 +1,47 @@
+version: '3.4'
+
+volumes:
+  database:
+    driver: local
+
+services:
+<%- if has?('pg') -%>
+  postgres:
+    image: postgres:13.1
+    volumes:
+      - database:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=<%= config.name %>
+      - POSTGRES_USER=<%= config.name %>
+      - POSTGRES_PASSWORD=<%= config.name %>
+<%- end -%>
+<%- if has?('mysql2') -%>
+  mysql:
+    image: mysql:8.0
+    volumes:
+      - database:/var/lib/mysql
+    environment:
+      - MYSQL_USER=<%= config.name %>
+      - MYSQL_PASSWORD=<%= config.name %>
+      - MYSQL_DATABASE=<%= config.name %>
+      - MYSQL_ROOT_PASSWORD=<%= config.name %>
+<%- end -%>
+  application:
+<%- if config.registry.nil? -%>
+    build:
+      context: .
+<%- else -%>
+    image: <%= config.registry %>
+<%- end -%>
+    environment:
+      - RAILS_MASTER_KEY
+      - AUTO_MIGRATION=yes
+      <%- if has?('pg') -%>
+      - DATABASE_URL=postgres://<%= config.name %>:<%= config.name %>@postgres/<%= config.name %>
+      <%- elsif has?('mysql2') %>
+      - DATABASE_URL=mysql2://<%= config.name %>:<%= config.name %>@mysql/<%= config.name %>
+      <%- end -%>
+    ports:
+      - "3000:3000"
+    depends_on:
+      - postgres

data/templates/dockerignore.tt

@@ -29,7 +29,19 @@ rspec.xml
 # Rails
 log/*
 tmp/*
+/config/master.key
+
+# Frontend
+node_modules/
 
 # Licensed
 .licensed.yml
 .licenses
+
+# Boxing
+config/boxing.rb
+<% if config.ignores -%>
+
+# Customize Ignores
+<%= Array[config.ignores].join("\n") %>
+<%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxing
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.2
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,13 +60,17 @@ files:
 - exe/boxing
 - lib/boxing.rb
 - lib/boxing/command.rb
+- lib/boxing/commands/base.rb
+- lib/boxing/commands/compose.rb
 - lib/boxing/commands/generate.rb
 - lib/boxing/commands/update.rb
+- lib/boxing/config.rb
 - lib/boxing/context.rb
 - lib/boxing/database.rb
 - lib/boxing/package.rb
 - lib/boxing/version.rb
 - templates/Dockerfile.tt
+- templates/docker-compose.yml.tt
 - templates/dockerignore.tt
 homepage: https://github.com/elct9620/boxing
 licenses: []