bullion 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 492f8a3bde7d33dbbea336746adb4c37e479cef37f3057818090a7f1603d72db
-  data.tar.gz: 1bb02e31080caef0cb917ac178605f65fb33aa40f8c0790d970c3902e7990b5e
+  metadata.gz: 74fbfc1ee8b98c2ff1c707302c8e62c9b2f8d106308b8b3b02d6a1ffe622cb77
+  data.tar.gz: adbd79fc4e82a9630dee2dd71c1e33c7e0a8f02732c986af07b1ba3d1733fd5c
 SHA512:
-  metadata.gz: 553bc8beb6536fd32b0ca0ac43ea86031747e0758c2c819f38c5e4243664091f6d3509b721d1207ac7596a1d668ba6483e57dbda3f4190d47c4260cc2bdf6ee1
-  data.tar.gz: a24b70400af69f84513725fdeb28a6365660509c796704dabffc9cb68e44d3288fe6b757e4bdf5d9231d45a48a04b11542ac6517c010275c49d7a9651d81f7f3
+  metadata.gz: f1cfc723554109cdb6e837e2dabd66eed6dd52d3cd7ca649923f88940c31e83e957e749ec1449c6eef4ffbcc89aafbbf822a3725b55688a3dc5d4290bd63552b
+  data.tar.gz: ccbe2a235fa91b4568b6977f55b22122de5f0fc1e0c2620c4ef9e16dfc4ce618ccff0322ea1e5c9dc3711f2dc10b22a9dc0bcd5c45d406adb08640229ec78048

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.9.0"
+  ".": "0.10.0"
 }

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.10.0](https://github.com/jgnagy/bullion/compare/bullion/v0.9.0...bullion/v0.10.0) (2025-07-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* update Docker image with Itsi configuration
+
+### Bug Fixes
+
+* update Docker image with Itsi configuration ([4be39dd](https://github.com/jgnagy/bullion/commit/4be39dd6200f058907029e23a07f19241705b701))
+
 ## [0.9.0](https://github.com/jgnagy/bullion/compare/bullion/v0.8.0...bullion/v0.9.0) (2025-07-05)
 
 

data/Dockerfile

@@ -16,7 +16,7 @@ FROM ruby:3.4.4
 LABEL maintainer="Jonathan Gnagy <jonathan.gnagy@gmail.com>"
 
 ENV BULLION_PORT=9292
-ENV BULLION_ENVIRONMENT=development
+ENV RACK_ENV=production
 ENV DATABASE_URL=sqlite3:///tmp/bullion.db
 
 RUN apt-get update && apt-get upgrade -y && apt-get -y install libsqlite3-dev sqlite3 curl libsodium-dev build-essential libclang-dev
@@ -27,6 +27,7 @@ COPY ./scripts/docker-entrypoint.sh /entrypoint.sh
 COPY --from=build /bullion.gem /app/bullion.gem
 COPY ./db /app/db
 COPY ./config.ru /app/config.ru
+COPY ./Itsi.rb /app/Itsi.rb
 COPY ./Rakefile /app/Rakefile
 
 RUN mkdir /ssl
@@ -34,7 +35,8 @@ RUN mkdir /ssl
 RUN chmod +x /entrypoint.sh \
     && chown nobody /app/db \
     && chown nobody /app/db/schema.rb \
-    && chown -R nobody:nogroup /ssl
+    && chown -R nobody:nogroup /ssl \
+    && chown nobody /app
 
 WORKDIR /app
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullion (0.9.0)
+    bullion (0.10.0)
       benchmark (~> 0.4)
       dry-configurable (~> 1.1)
       httparty (~> 0.21)

data/Itsi.rb

@@ -10,13 +10,13 @@ env = ENV.fetch("APP_ENV") { ENV.fetch("RACK_ENV", "development") }
 
 # Number of worker processes to spawn
 # If more than 1, Itsi will be booted in Cluster mode
-workers ENV["ITSI_WORKERS"]&.to_i || (env == "development" ? 1 : nil)
+workers ENV["WORKERS"]&.to_i || (env == "development" ? 1 : nil)
 
 # Number of threads to spawn per worker process
 # For pure CPU bound applicationss, you'll get the best results keeping this number low
 # Setting a value of 1 is great for superficial benchmarks, but in reality
 # it's better to set this a bit higher to allow expensive requests to get overtaken and minimize head-of-line blocking
-threads ENV.fetch("ITSI_THREADS", 3)
+threads ENV.fetch("THREADS", 3).to_i
 
 # If your application is IO bound (e.g. performing a lot of proxied HTTP requests, or heavy queries etc)
 # you can see *substantial* benefits from enabling this option.
@@ -24,7 +24,7 @@ threads ENV.fetch("ITSI_THREADS", 3)
 # E.g.
 # `fiber_scheduler "Itsi::Scheduler"` - The default fast and light-weight scheduler that comes with Itsi
 # `fiber_scheduler "Async::Scheduler"` - Bring your own scheduler!
-fiber_scheduler nil
+fiber_scheduler "Itsi::Scheduler"
 
 # If you bind to https, without specifying a certificate, Itsi will use a self-signed certificate.
 # The self-signed certificate will use a CA generated for your
@@ -45,7 +45,7 @@ fiber_scheduler nil
 # bind "unix:///tmp/itsi.sock"
 # bind "tls:///tmp/itsi.secure.sock"
 
-bind "http://0.0.0.0:9292"
+bind "http://0.0.0.0:#{ENV.fetch("BULLION_PORT", 9292)}"
 
 # If you want to preload the application, set preload to true
 # to load the entire rack-app defined in rack_file_name before forking.
@@ -64,7 +64,7 @@ preload true
 # When this limit is reached, the worker will be gracefully restarted.
 # Only one worker is restarted at a time to ensure we don't take down
 # all of them at once, if they reach the threshold simultaneously.
-worker_memory_limit 1024 * 1024 * 1024
+worker_memory_limit ENV.fetch("WORKER_MEMORY_LIMIT") { 1024 * 1024 * 1024 } # Default to 1GB
 
 # You can provide an optional block of code to run, when a worker hits its memory threshold
 # (Use this to send yourself an alert,
@@ -96,7 +96,7 @@ oob_gc_responses_threshold 512
 # Log level
 # Set this to one of the following values: debug, info, warn, error, fatal
 # Can also be set using the ITSI_LOG environment variable
-log_level :info
+log_level ENV.fetch("LOG_LEVEL", "warn").to_sym
 
 # Log Format
 # Set this to be either :plain or :json. If you leave it blank Itsi will try

data/README.md

@@ -40,8 +40,9 @@ Whether run locally or via Docker, the following environment variables configure
 | `DNS01_NAMESERVERS` | _None_ | A comma-delimited list of nameservers to use for resolving [DNS-01](https://letsencrypt.org/docs/challenge-types/#dns-01-challenge) challenges. Usually you'll want this to be set to your _internal_ nameservers so internal names resolve correctly. When not set, it'll use the host's DNS. |
 | `LOG_LEVEL` | `warn` | Log level for Bullion. Supported levels (starting with the noisiest) are debug, info, warn, error, and fatal. |
 | `BULLION_PORT` | `9292` | TCP port Bullion will listen on. |
-| `MIN_THREADS` | `2` | Minimum number of [Puma](https://puma.io/) threads for processing requests. |
-| `MAX_THREADS` | `32` | Maximum number of [Puma](https://puma.io/) threads for processing requests. |
+| `THREADS` | `3` | Number of [Itsi threads](https://itsi.fyi/options/threads/) for processing requests. |
+| `WORKERS` | `1` | Number of [Itsi workers](https://itsi.fyi/options/workers/) to spawn. |
+| `WORKER_MEMORY_LIMIT` | `1024**3` | [Itsi worker memory limit](https://itsi.fyi/options/worker_memory_limit/) for each worker process (in bytes). Default is 1GiB. |
 | `RACK_ENV` | `production`* | When run via Docker, the default is `production`, when run via `rake local_demo` it is `development`. Used to tell Bullion if it is run in development mode or for testing. |
 
 ### Integrating

data/Rakefile

@@ -4,12 +4,62 @@ ENV["RACK_ENV"] ||= "development"
 
 if %w[development test].include? ENV["RACK_ENV"]
   ENV["DATABASE_URL"] = "sqlite3:#{File.expand_path(".")}/tmp/db/#{ENV["RACK_ENV"]}.sqlite3"
+  require "bundler/gem_tasks"
+  require "rspec/core/rake_task"
+  require "rubocop/rake_task"
+  require "yard"
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.exclude_pattern = "spec/integration/**{,/*/**}/*_spec.rb"
+    t.rspec_opts = "--require spec_helper"
+  end
+  RSpec::Core::RakeTask.new(:integration_testing) do |t|
+    t.pattern = "spec/integration/**{,/*/**}/*_spec.rb"
+    t.rspec_opts = "--require integration_helper"
+  end
+  RuboCop::RakeTask.new(:rubocop)
+  YARD::Rake::YardocTask.new
+
+  desc "Runs a backgrounded demo environment"
+  task :demo do
+    rack_env = "test"
+    database_url = "sqlite3:#{File.expand_path(".")}/tmp/db/#{rack_env}.sqlite3"
+    system("RACK_ENV=\"#{rack_env}\" DATABASE_URL=\"#{database_url}\" bundle exec rake db:migrate")
+    system(
+      "RACK_ENV=\"#{rack_env}\" DATABASE_URL=\"#{database_url}\" " \
+      "LOG_LEVEL='#{ENV.fetch("LOG_LEVEL", "info")}' " \
+      "itsi --daemonize"
+    )
+    FileUtils.touch(File.join(File.expand_path("."), "tmp", "daemon.pid"))
+  end
+
+  desc "Runs a foregrounded demo environment"
+  task :foreground_demo do
+    system("itsi")
+  end
+
+  desc "Cleans up test or demo environment"
+  task :cleanup do
+    at_exit do
+      pid_file = File.join(File.expand_path("."), "tmp", "daemon.pid")
+      if File.exist?(pid_file)
+        system("itsi stop")
+        FileUtils.rm_f(pid_file)
+      end
+      FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "tls.crt"))
+      FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "tls.key"))
+      FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "root_tls.crt"))
+      FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "root_tls.key"))
+      FileUtils.rm_rf(File.join(File.expand_path("."), "tmp", "db"))
+      ENV["CA_DIR"] = nil
+      ENV["CA_SECRET"] = nil
+      ENV["CA_DOMAINS"] = nil
+    end
+  end
+
+  Rake::Task["integration_testing"].enhance(["cleanup"])
 end
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
-require "yard"
 require "openssl"
 require "sqlite3"
 require "sinatra/activerecord/rake"
@@ -22,17 +72,6 @@ namespace :db do
   end
 end
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.exclude_pattern = "spec/integration/**{,/*/**}/*_spec.rb"
-  t.rspec_opts = "--require spec_helper"
-end
-RSpec::Core::RakeTask.new(:integration_testing) do |t|
-  t.pattern = "spec/integration/**{,/*/**}/*_spec.rb"
-  t.rspec_opts = "--require integration_helper"
-end
-RuboCop::RakeTask.new(:rubocop)
-YARD::Rake::YardocTask.new
-
 desc "Prepares a demo or test environment"
 task :prep do
   FileUtils.mkdir_p(File.join(File.expand_path("."), "tmp"))
@@ -108,45 +147,6 @@ task :prep do
   )
 end
 
-desc "Runs a backgrounded demo environment"
-task :demo do
-  rack_env = "test"
-  database_url = "sqlite3:#{File.expand_path(".")}/tmp/db/#{rack_env}.sqlite3"
-  system("RACK_ENV=\"#{rack_env}\" DATABASE_URL=\"#{database_url}\" bundle exec rake db:migrate")
-  system(
-    "RACK_ENV=\"#{rack_env}\" DATABASE_URL=\"#{database_url}\" " \
-    "LOG_LEVEL='#{ENV.fetch("LOG_LEVEL", "info")}' " \
-    "itsi --daemonize"
-  )
-  FileUtils.touch(File.join(File.expand_path("."), "tmp", "daemon.pid"))
-end
-
-desc "Runs a foregrounded demo environment"
-task :foreground_demo do
-  system("itsi")
-end
-
-desc "Cleans up test or demo environment"
-task :cleanup do
-  at_exit do
-    pid_file = File.join(File.expand_path("."), "tmp", "daemon.pid")
-    if File.exist?(pid_file)
-      system("itsi stop")
-      FileUtils.rm_f(pid_file)
-    end
-    FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "tls.crt"))
-    FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "tls.key"))
-    FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "root_tls.crt"))
-    FileUtils.rm_f(File.join(File.expand_path("."), "tmp", "root_tls.key"))
-    FileUtils.rm_rf(File.join(File.expand_path("."), "tmp", "db"))
-    ENV["CA_DIR"] = nil
-    ENV["CA_SECRET"] = nil
-    ENV["CA_DOMAINS"] = nil
-  end
-end
-
-Rake::Task["integration_testing"].enhance(["cleanup"])
-
 task test: %i[prep db:migrate spec demo integration_testing]
 task unit: %i[prep db:migrate spec]
 

data/lib/bullion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullion
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/scripts/docker-entrypoint.sh

@@ -2,8 +2,4 @@
 
 # Starts the server
 rake db:migrate
-puma \
-  -p ${BULLION_PORT:-9292} \
-  -e ${RACK_ENV:-production} \
-  -t ${MIN_THREADS:-2}:${MAX_THREADS:-32} \
-  config.ru
+itsi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullion
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -400,7 +400,6 @@ files:
 - bin/setup
 - bullion.gemspec
 - config.ru
-- config/puma.rb
 - db/migrate/20210104000000_create_accounts.rb
 - db/migrate/20210104060422_create_certificates.rb
 - db/migrate/20210105060406_create_orders.rb

data/config/puma.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-threads 2, Integer(ENV.fetch("MAX_THREADS", 32))