fly.io-rails 0.1.3-arm64-darwin → 0.1.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b975ae381f0e1c3fa9788dfcae289bc01345c170f18a7b650cb1751c23857fc7
-  data.tar.gz: 0ea49ed23d8c1786810dea81e6333ee6038f8ad322cd4b4f518186fd882710af
+  metadata.gz: c5b51eb7f2d1610fb30b0a6fd3d57231537c2ebfbe0aeb2b11a4bb1262e30fec
+  data.tar.gz: 517fde9bf686c0ab23905995ddef33efa7c62e157a872146922557af385a555a
 SHA512:
-  metadata.gz: e658d9145f7d7e42d4a90fdef78bb02167d0bdaf4d7cfb12579a2167ac9d2d953186fda88509c22cd38cd17e456438741f50beb711793440a285f521d635d319
-  data.tar.gz: 306dcd59f6804655b7c8123e00e1657320a9637028f0c02fbc7300622e06ca6a6a14f0f872d77cb1dd90c7dbfcf18eda7f152e7a8811bdfdb8c9c11e6efcf152
+  metadata.gz: bb24d9eb76f794c454c2f9145a99bf65e56bdd3d14a54c8464b60e9c75f61c9ac74ff737c40b674082fff12ae82962ff51e0569502a6f20776b0675ec45e3383
+  data.tar.gz: 52a0bfc9f46dfe2a45558d93b5c4f80ce659e7a0b270a5b8b848ed106d7468a01b38b9b11a3123aac8afb9774a9f2117e17610c0c83e17edfe97cd65673c5235

data/lib/fly.io-rails/actions.rb

@@ -16,8 +16,11 @@ module Fly
     include Fly::Scanner
     attr_accessor :options
 
-    def initialize(app, regions = nil)
+    def initialize(app, options={})
       self.app = app
+      regions = options[:region].flatten || []
+      @litefs = options[:litefs]
+      @set_stage = options[:nomad] ? 'set' : 'set --stage'
 
       @ruby_version = RUBY_VERSION
       @bundler_version = Bundler::VERSION
@@ -37,6 +40,7 @@ module Fly
       end
 
       @region = @regions.first || 'iad'
+      @regions = [@region] if @regions.empty?
 
       @config = Fly::DSL::Config.new
       if File.exist? 'config/fly.rb'
@@ -87,6 +91,10 @@ module Fly
       app_template 'fly.rake.erb', 'lib/tasks/fly.rake'
     end
 
+    def generate_litefs
+      app_template 'litefs.yml.erb', 'config/litefs.yml'
+    end
+
     def generate_key
       credentials = nil
       if File.exist? 'config/credentials/production.key'
@@ -96,8 +104,8 @@ module Fly
       end
   
       if credentials
-        say_status :run, "flyctl secrets set --stage RAILS_MASTER_KEY from #{credentials}"
-        system "flyctl secrets set --stage RAILS_MASTER_KEY=#{IO.read(credentials).chomp}"
+        say_status :run, "flyctl secrets #{@set_stage} RAILS_MASTER_KEY from #{credentials}"
+        system "flyctl secrets #{@set_stage} RAILS_MASTER_KEY=#{IO.read(credentials).chomp}"
         puts
       end
   
@@ -126,9 +134,9 @@ module Fly
     def create_volume(app, region, size)
       volume = "#{app.gsub('-', '_')}_volume"
       volumes = JSON.parse(`flyctl volumes list --json`).
-        map {|volume| volume['Name']}
+        map {|volume| [volume['Name'], volume['Region']]}
 
-      unless volumes.include? volume
+      unless volumes.include? [volume, region]
         cmd = "flyctl volumes create #{volume} --app #{app} --region #{region} --size #{size}"
         say_status :run, cmd
         system cmd
@@ -204,7 +212,13 @@ module Fly
       end
 
       if @sqlite3
-        @volume = create_volume(app, @region, @config.sqlite3.size) 
+        if @litefs
+          @regions.each do |region|
+            @volume = create_volume(app, region, @config.sqlite3.size) 
+          end
+        else
+          @volume = create_volume(app, @region, @config.sqlite3.size) 
+        end
       elsif @postgresql and not secrets.include? 'DATABASE_URL'
         secret = create_postgres(app, @org, @region,
           @config.postgres.vm_size,
@@ -212,7 +226,7 @@ module Fly
           @config.postgres.initial_cluster_size)
 
         if secret
-          cmd = "flyctl secrets set --stage DATABASE_URL=#{secret}"
+          cmd = "flyctl secrets #{@set_stage} DATABASE_URL=#{secret}"
           say_status :run, cmd
           system cmd
         end
@@ -225,7 +239,7 @@ module Fly
         secret = create_redis(app, @org, @region, eviction)
 
         if secret
-          cmd = "flyctl secrets set --stage REDIS_URL=#{secret}"
+          cmd = "flyctl secrets #{@set_stage} REDIS_URL=#{secret}"
           say_status :run, cmd
           system cmd
         end
@@ -293,6 +307,10 @@ module Fly
         config[:env] = {
           "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
         }
+
+        if @litefs
+          config[:env]['DATABASE_URL'] = "sqlite3:///data/production.sqlite3"
+        end
       end
 
       # process toml overrides

data/lib/fly.io-rails/utils.rb

@@ -28,12 +28,14 @@ module FlyIoRails
       data.join
     end
 
-    def create_app(name=nil, org='personal', regions=[])
+    def create_app(name: nil, org: 'personal', regions: [], nomad: false, **rest)
       cmd = if name
         "flyctl apps create #{name.inspect} --org #{org.inspect} --machines"
       else
         "flyctl apps create --generate-name --org #{org.inspect} --machines"
       end
+
+      cmd.sub! ' --machines', '' if nomad
   
       output = tee cmd
       exit 1 unless output =~ /^New app created: /

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/generators/fly/app_generator.rb

@@ -7,19 +7,23 @@ class AppGenerator < Rails::Generators::Base
   class_option :name, type: :string, required: false
   class_option :org, type: :string, default: 'personal'
   class_option :region, type: :array, repeatable: true, default: []
+  class_option :nomad, type: :boolean, default: false
+
+  class_option :litefs, type: :boolean, default: false
 
   def generate_app
     source_paths.push File.expand_path('../templates', __dir__)
 
-    create_app(options[:name], options[:org], options)
+    create_app(**options.symbolize_keys)
 
-    action = Fly::Actions.new(@app, options[:region])
+    action = Fly::Actions.new(@app, options)
 
     action.generate_toml
     action.generate_fly_config unless File.exist? 'config/fly.rb'
     action.generate_dockerfile unless File.exist? 'Dockerfile'
     action.generate_dockerignore unless File.exist? '.dockerignore'
     action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
+    action.generate_litefs if options[:litefs] and not File.exist? 'config/litefs'
     action.generate_patches
     action.generate_ipv4
     action.generate_ipv6
@@ -27,4 +31,4 @@ class AppGenerator < Rails::Generators::Base
     action.launch(@app)
   end
 end
-end
+end

data/lib/generators/fly/terraform_generator.rb

@@ -8,12 +8,14 @@ class TerraformGenerator < Rails::Generators::Base
   class_option :org, type: :string, default: 'personal'
   class_option :region, type: :array, repeatable: true, default: []
 
+  class_option :litefs, type: :boolean, default: false
+
   def terraform
     source_paths.push File.expand_path('../templates', __dir__)
 
-    create_app(options[:name], options[:org], options[:region])
+    create_app(**options.symbolize_keys)
 
-    action = Fly::Actions.new(@app, options[:region])
+    action = Fly::Actions.new(@app, options)
     
     action.generate_toml
     action.generate_dockerfile
@@ -27,4 +29,4 @@ class TerraformGenerator < Rails::Generators::Base
     tee 'terraform init'
   end
 end
-end
+end

data/lib/generators/templates/Dockerfile.erb

@@ -21,6 +21,8 @@ ARG RUBY_VERSION=<%= @ruby_version %>
 ARG VARIANT=jemalloc-slim
 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base
 
+LABEL fly_launch_runtime="rails"
+
 <% if @node -%>
 ARG NODE_VERSION=<%= @node_version %>
 <% end -%>
@@ -54,7 +56,12 @@ RUN volta install node@${NODE_VERSION} yarn
 
 FROM base as build_deps
 
-ARG BUILD_PACKAGES="git build-essential libpq-dev wget vim curl gzip xz-utils libsqlite3-dev"
+<% 
+  @build_packages = %w(git build-essential wget vim curl gzip xz-utils)
+  @build_packages << 'libpq-dev' if @postgresql
+  @build_packages << 'libsqlite3-dev' if @sqlite3
+-%>
+ARG BUILD_PACKAGES=<%= @build_packages.join(' ').inspect %>
 ENV BUILD_PACKAGES ${BUILD_PACKAGES}
 
 RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
@@ -92,12 +99,24 @@ RUN npm install
 
 <% end -%>
 #######################################################################
+<% if @litefs -%>
+
+# Fetch the LiteFS binary
+FROM flyio/litefs:pr-109 AS litefs
 
+#######################################################################
+<% end %>
 # install deployment packages
 
 FROM base
 
-ARG DEPLOY_PACKAGES="postgresql-client file vim curl gzip libsqlite3-0"
+<%
+  @deploy_packages = %w(file vim curl gzip)
+  @deploy_packages << 'postgresql-client' if @postgresql
+  @deploy_packages << 'libsqlite3-0' if @sqlite3
+  @deploy_packages << 'fuse' if @litefs
+-%>
+ARG DEPLOY_PACKAGES=<%= @deploy_packages.join(' ').inspect %>
 ENV DEPLOY_PACKAGES=${DEPLOY_PACKAGES}
 
 RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
@@ -116,6 +135,16 @@ COPY --from=gems /usr/local/bundle /usr/local/bundle
 # copy installed node modules
 COPY --from=node_modules /app/node_modules /app/node_modules
 
+<% end -%>
+<% if @litefs -%>
+# copy litefs binary
+COPY --from=litefs /usr/local/bin/litefs /usr/local/bin/litefs
+
+# Copy our LiteFS configuration.
+ADD config/litefs.yml /etc/litefs.yml
+
+# Create mount point
+RUN mkdir /data
 <% end -%>
 #######################################################################
 
@@ -140,6 +169,10 @@ RUN ${BUILD_COMMAND}
 
 # Default server start instructions.  Generally Overridden by fly.toml.
 ENV PORT 8080
+<% if @litefs -%>
+ARG SERVER_COMMAND="litefs"
+<% else -%>
 ARG SERVER_COMMAND="bin/rails fly:server"
+<% end -%>
 ENV SERVER_COMMAND ${SERVER_COMMAND}
 CMD ${SERVER_COMMAND}

data/lib/generators/templates/fly.rake.erb

@@ -6,6 +6,7 @@ namespace :fly do
   #  - Failures here prevent deployment
   task :build => 'assets:precompile'
 
+<% unless @litefs -%>
   # RELEASE step:
   #  - changes to the filesystem made here are DISCARDED
   #  - full access to secrets, databases
@@ -16,6 +17,7 @@ namespace :fly do
   task :release => 'db:migrate'
   <%- end -%>
 
+<% end -%>
   # SERVER step:
   #  - changes to the filesystem made here are deployed
   #  - full access to secrets, databases

data/lib/generators/templates/fly.toml.erb

@@ -6,15 +6,23 @@ processes = []
 [build]
   [build.args]
     BUILD_COMMAND = "bin/rails fly:build"
+<% if @litefs -%>
+    SERVER_COMMAND = "litefs"
+<% else -%>
     SERVER_COMMAND = "bin/rails fly:server"
 
 [deploy]
   release_command = "bin/rails fly:release"
+<% end -%>
 
 [env]
   PORT = "8080"
 <% if @sqlite3 -%>
+<% if @litefs -%>
+  DATABASE_URL = "sqlite3:///data/production.sqlite3"
+<% else -%>
   DATABASE_URL = "sqlite3:///mnt/volume/production.sqlite3"
+<% end -%>
 
 [mounts]
 source = <%= "#{app.gsub('-', '_')}_volume".inspect %>
@@ -24,6 +32,9 @@ destination = "/mnt/volume"
 [experimental]
   allowed_public_ports = []
   auto_rollback = true
+<% if @litefs -%>
+  enable_consul = true
+<% end  -%>
 
 [[services]]
   http_checks = []

data/lib/generators/templates/litefs.yml.erb

@@ -0,0 +1,14 @@
+# The path to where the SQLite database will be accessed.
+mount-dir: "/data"
+
+# The path to where the underlying volume mount is.
+data-dir: "/mnt/volume"
+
+# Execute this subprocess once LiteFS connects to the cluster. 
+exec: "bin/rails fly:server"
+
+# These environment variables will be available in your Fly.io application.
+# You must specify "experiement.enable_consul" for FLY_CONSUL_URL to be available.
+consul:
+  url: "${FLY_CONSUL_URL}"
+  advertise-url: "http://${HOSTNAME}.vm.${FLY_APP_NAME}.internal:20202"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: arm64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -67,6 +67,7 @@ files:
 - lib/generators/templates/fly.rake.erb
 - lib/generators/templates/fly.rb.erb
 - lib/generators/templates/fly.toml.erb
+- lib/generators/templates/litefs.yml.erb
 - lib/generators/templates/main.tf.erb
 - lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake