boxing 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be259e85a114d20ff05ffcc30a4342e5f678a5c1b6a4249e0c99111978dc7061
-  data.tar.gz: 35092941e6927158bab8530cfa678f6c2ff99533630e47b9034ba09c6a88f8fd
+  metadata.gz: cd1ab96ae737b37be480b3d7d862a5925b951062f7ccae22eb200d26e55f3a14
+  data.tar.gz: 8cd2271e0cb3fc6736c2440f978bdee63b0ba43c90a57596f9064f5b576788ae
 SHA512:
-  metadata.gz: a6f1023671f6ca0c2f364bdcdb7f8804b8d87e39ae22cd905209c59f4234fe8a438c6423f73012451bf21d780d8bbe2caedd70cfe51f08cfc2ad5607c2dec01a
-  data.tar.gz: 94acc2f1314279b78e884c3f7361e02cff3935cd720a266bb5d4cf67ed92f7db8791a08f12b7a862fc8be2e39dbe686d3aff865375a7a93e0cebc031d777b0af
+  metadata.gz: 0c4c43055ed9973e21b4e1660fff4bc5f6cd870f08f82339a0ea88be4edde2914c2e37086a5bf92a48e493c12fb2ba20c68bb28c936fcd2e3f77a6fe5e5edf29
+  data.tar.gz: 25dd924fc89a7aa20361acbcdc2c52b0e320c007308ac1a79a227df9938c2b575f7ee468a0dac1dd5cda8d17a820ea0c6e2fcb18de3ad7e7c15c5fa8746205cd

data/Gemfile.lock

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

data/README.md

@@ -86,7 +86,7 @@ If `config/boxing.rb` is found, it will be loaded and change the generated `Dock
 
 ```ruby
 Boxing.config do |c|
- c.root = '/var/www'
+  c.root = '/var/www'
 end
 ```
 
@@ -94,9 +94,30 @@ end
 
 ```ruby
 Boxing.config do |c|
- c.ignores = %w[
-   vendor/gems
- ]
+  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
 ```
 
@@ -104,8 +125,8 @@ end
 
 ```ruby
 Boxing.config do |c|
- c.health_check = true
- c.health_check_path = '/api/status.json'
+  c.health_check = true
+  c.health_check_path = '/api/status.json'
 end
 ```
 
@@ -120,6 +141,8 @@ end
 * [ ] 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
@@ -127,7 +150,7 @@ end
     * [ ] Build Stage
     * [ ] Entrypoint
     * [ ] Command
-    * [ ] Expose Port
+    * [x] Expose Port
 * [x] Health Check
   * [x] [Liveness](https://github.com/elct9620/openbox) gem detection
   * [x] Add `curl` for web application

data/lib/boxing/config.rb

@@ -9,7 +9,10 @@ module Boxing
     #   @return [String] the application root
     #
     # @since 0.5.0
-    attr_accessor :root, :name, :registry, :ignores, :port, :health_check, :health_check_path
+    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)
@@ -17,6 +20,7 @@ module Boxing
       @root = '/srv/app'
       @port = 9292
       @health_path = '/status'
+      @assets_precompile = false
 
       instance_exec(self, &block) if defined?(yield)
     end

data/lib/boxing/context.rb

@@ -29,7 +29,7 @@ module Boxing
     def packages
       @packages ||=
         Set
-        .new(default_packages)
+        .new(default_packages + extra_packages)
         .merge(
           @dependencies
           .map(&:name)
@@ -71,6 +71,31 @@ module Boxing
         .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.5.0'
+  VERSION = '0.6.0'
 end

data/templates/Dockerfile.tt

@@ -1,5 +1,6 @@
 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,12 @@ 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}
+COPY --from=assets /${APP_ROOT}/public /${APP_ROOT}/public
 
 ARG REVISION
 ENV REVISION $REVISION
@@ -60,7 +86,6 @@ RUN adduser -h ${APP_ROOT} -D -s /bin/nologin ruby ruby && \
 USER ruby
 WORKDIR ${APP_ROOT}
 
-
 EXPOSE <%= config.port %>
 <%- if has?('liveness') || config.health_check -%>
 HEALTHCHECK CMD curl -f http://localhost:<%= config.port %><%= config.health_check_path %> || exit 1

data/templates/dockerignore.tt

@@ -30,6 +30,9 @@ rspec.xml
 log/*
 tmp/*
 
+# Frontend
+node_modules/
+
 # Licensed
 .licensed.yml
 .licenses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxing
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler