boxing 0.7.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b091fd5571f50dba6d62046e28c106088420a71c600f9a6727fc1404a84a2d19
-  data.tar.gz: 575167c02a814facdbb558a7836c9e29f15c9f058e37cd71a0828fe011655840
+  metadata.gz: cc711842897fe99033eddd84096476da91f3e8978932f1b7e6ad81c92e58d6a8
+  data.tar.gz: aa5a956bdaefd0aad083eb1d953850692110c87ce1b7feebdd7a0bf9b1b0437b
 SHA512:
-  metadata.gz: 282bfa9bfa4fa4da1e43987fc1ed902403a9de8ea74b4f3607f04855edab1557fcc2a791c4033dcc0dc072a87d341b4d519853315a64d5e8882e794199030b62
-  data.tar.gz: 98d5df84a6455d92331ab48da7ebdd5d2aebacd2ba3cafac3b47e3e82fa7603477ab7f7a75507b0db51976ba3e970184b014097a49db7eacd404a91282c4945d
+  metadata.gz: 4ec68e4a79a4c7143c7cb5c627a066fcb358752e6d1a070f76da6ceda516ee4d3c684505bafeac107d3dd83b68bed3d24b4d44e9a489ce716a2832da89c3afea
+  data.tar.gz: afcafc86d6cd2bf263982da25245ba29eb97c9bc7957da8c2a3b01a72e03bef095c94060c565d79ace96cc62b0edec7e644315ea7128ceffc3791e6666751d86

data/Gemfile.lock

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

data/README.md

@@ -109,6 +109,24 @@ Boxing.config do |c|
 end
 ```
 
+### Revision Information
+
+```ruby
+Boxing.config do |c|
+  c.revision = true
+end
+```
+> When building the image, you have to add `--build-arg REVISION=...` to set your revision name to compile it correctly.
+
+### Sentry Support
+
+```ruby
+Boxing.config do |c|
+  c.sentry_release = true
+end
+```
+> When building the image, you have to add `--build-arg SENTRY_RELEASE=...` to set your release name to compile it correctly.
+
 ### Assets Precompile
 
 This feature is disabled by default and suggest to use CI to build it.
@@ -120,7 +138,6 @@ Boxing.config do |c|
   c.node_version = '14.18'
 end
 ```
-
 > When building the image, you have to add `--build-arg RAILS_MASTER_KEY=...` to set your production key to compile it correctly.
 
 ### Health Check

data/lib/boxing/config.rb

@@ -12,12 +12,14 @@ module Boxing
     attr_accessor :root, :name, :registry, :ignores, :port,
                   :health_check, :health_check_path,
                   :assets_precompile, :node_version,
-                  :build_packages, :runtime_packages
+                  :build_packages, :runtime_packages,
+                  :revision, :sentry_release,
+                  :entrypoint, :command
 
     # @since 0.5.0
     def initialize(&block)
       @name = 'myapp'
-      @root = '/srv/app'
+      @root = '/src/app'
       @port = 9292
       @health_check_path = '/status'
       @assets_precompile = false

data/lib/boxing/context.rb

@@ -115,5 +115,31 @@ module Boxing
       mode |= Package::RUNTIME if config.runtime_packages&.include?(name)
       mode
     end
+
+    # Return entrypoint options
+    #
+    # @return [Array<String>]
+    #
+    # @since 0.9.0
+    def entrypoint
+      return config.entrypoint.map(&:to_s) if config.entrypoint
+      return ['bin/openbox'] if has?('openbox')
+      return ['bin/rails'] if has?('rails')
+
+      %w[bundle exec]
+    end
+
+    # Return command options
+    #
+    # @return [Array<String>]
+    #
+    # @since 0.9.0
+    def command
+      return config.command.map(&:to_s) if config.command
+      return ['server'] if has?('openbox')
+      return ['server', '-b', '0.0.0.0'] if has?('rails')
+
+      ['rackup', '-o', '0.0.0.0']
+    end
   end
 end

data/lib/boxing/version.rb

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

data/templates/Dockerfile.tt

@@ -2,7 +2,7 @@ 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
+FROM ruby:${RUBY_VERSION}-alpine AS base
 ARG APP_ROOT
 
 RUN apk add --no-cache <%= packages.select(&:build?).join(' ') %>
@@ -22,6 +22,10 @@ RUN gem install bundler:<%= Bundler::VERSION %> \
     && find ${APP_ROOT}/vendor/bundle -type f -name '*.o' -delete \
     && find ${APP_ROOT}/vendor/bundle -type f -name '*.gem' -delete
 
+<%- if has?('bootsnap') -%>
+RUN bundle exec bootsnap precompile --gemfile app/ lib/
+
+<%- end -%>
 <%- if config.assets_precompile -%>
 FROM node:${NODE_VERSION}-alpine as node
 FROM ruby:${RUBY_VERSION}-alpine as assets
@@ -36,9 +40,9 @@ 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
+COPY --from=base /usr/local/bundle/config /usr/local/bundle/config
+COPY --from=base /usr/local/bundle /usr/local/bundle
+COPY --from=base ${APP_ROOT}/vendor/bundle ${APP_ROOT}/vendor/bundle
 
 RUN mkdir -p ${APP_ROOT}
 COPY . ${APP_ROOT}
@@ -55,10 +59,13 @@ ARG APP_ROOT
 RUN apk add --no-cache <%= packages.select(&:runtime?).join(' ') %>
 
 <%- end -%>
-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
+COPY --from=base /usr/local/bundle/config /usr/local/bundle/config
+COPY --from=base /usr/local/bundle /usr/local/bundle
+COPY --from=base ${APP_ROOT}/vendor/bundle ${APP_ROOT}/vendor/bundle
+<%- if has?('bootsnap') -%>
+COPY --from=base ${APP_ROOT}/tmp/cache ${APP_ROOT}/tmp/cache
 
+<%- end -%>
 RUN mkdir -p ${APP_ROOT}
 
 <%- if has?('rails') -%>
@@ -71,11 +78,18 @@ ENV APP_ROOT=$APP_ROOT
 COPY . ${APP_ROOT}
 <%- if config.assets_precompile -%>COPY --from=assets /${APP_ROOT}/public /${APP_ROOT}/public
 <%- end -%>
+<%- if config.revision -%>
 
 ARG REVISION
 ENV REVISION $REVISION
 ENV COMMIT_SHORT_SHA $REVISION
 RUN echo "${REVISION}" > ${APP_ROOT}/REVISION
+<%- end -%>
+<%- if config.sentry_release -%>
+
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE $SENTRY_RELEASE
+<%- end -%>
 
 # Apply Execute Permission
 RUN adduser -h ${APP_ROOT} -D -s /bin/nologin ruby ruby && \
@@ -93,13 +107,5 @@ 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"]
-<%- elsif has?('rails') -%>
-ENTRYPOINT ["bin/rails"]
-CMD ["server", "-b", "0.0.0.0"]
-<%- else -%>
-ENTRYPOINT ["bundle", "exec"]
-CMD ["rackup", "-o", "0.0.0.0"]
-<%- end -%>
+ENTRYPOINT <%= entrypoint %>
+CMD <%= command %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxing
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler