fly.io-rails 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0946f350aad927042c4071c450d4b496604d5875cf897da8922d0a371340ec1
-  data.tar.gz: 01150ca673153921b0e45c7bbb3c2a8f92af54690246540de7013ebb1152d4aa
+  metadata.gz: 2309c09c4343475c5bc0f9db6f8f62e2be0f0bdc57126fd524728099ab62c7d6
+  data.tar.gz: fe723aa4c5ca096cd5dc3bab2c2028200735a241c43b5db1a326cbafa87f786b
 SHA512:
-  metadata.gz: f2ded02fe306b754519a92436c847e7827025dc210324d45af17d0d0e8426cf07ef2d2547014aaee90a67dc040a70c4bfe59127ea498ee0f293044e8339d373e
-  data.tar.gz: f06701cee20630b08805f36a9959d78e83904a804fea6957c9d0cfcb04919121a8efc6e07da77e31af474dec62d19227bb880c79332f6cd54f675c850bcc39b1
+  metadata.gz: 2934c24e7c628b62170023cfc96a36592961cc3536985e1e4b67b0c262695ff3a86754c39c0b0bca8d28b7709f81c69924548f778b007a2911f1a9b8d146385f
+  data.tar.gz: 07c5bb14d2f15629dc0cea201bc9536cd864f9eb2cf2afdcc354821fe701464ba0ba03eb140f076007d7b6329d82de33f7a762618b33850e5909d322994d62f7

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

@@ -58,6 +58,7 @@ module Fly
       @config = Fly::DSL::Config.new
       if File.exist? 'config/fly.rb'
         @config.instance_eval IO.read('config/fly.rb')
+        @image = @config.image
       end
 
       # set additional variables based on application source
@@ -92,13 +93,16 @@ module Fly
         @anycable = true
       end
 
+      @nginx = @passenger || (@anycable and not @deploy)
+
       # determine processes
       @procs = {web: 'bin/rails server'}
-      @procs[:web] = "nginx -g 'daemon off;'" if @passenger
+      @procs[:web] = "nginx -g 'daemon off;'" if @nginx
+      @procs[:rails] = "bin/rails server -p 8081" if @nginx and not @passenger
       @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
       @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis == :internal
       @procs.merge! 'anycable-rpc': 'bundle exec anycable --rpc-host=0.0.0.0:50051',
-        'anycable-go': 'env ANYCABLE_RPC_HOST=$ANYCABLE_GO_RPC_HOST /usr/local/bin/anycable-go --port=8082 --host 0.0.0.0' if @anycable
+        'anycable-go': 'env /usr/local/bin/anycable-go --port=8082 --host 0.0.0.0  --rpc_host=localhost:50051' if @anycable
     end
 
     def app
@@ -106,6 +110,11 @@ module Fly
       self.app = TOML.load_file('fly.toml')['app']
     end
 
+    def render template
+      template = ERB.new(IO.read(File.expand_path(template, source_paths.last)), trim_mode: '-')
+      template.result(binding).chomp
+    end
+
     def app_template template_file, destination
       app
       template template_file, destination
@@ -123,9 +132,40 @@ module Fly
     end
 
     def generate_fly_config
+      select_image
       app_template 'fly.rb.erb', 'config/fly.rb'
     end
 
+    def select_image
+      return @image if @image and @image.include? ":#{@ruby_version}-"
+
+      tags = []
+
+      debian_releases = %w(stretch buster bullseye bookworm) 
+              
+      Net::HTTP.start('quay.io', 443, use_ssl: true) do |http|
+        (1..).each do |page|
+          request = Net::HTTP::Get.new "/api/v1/repository/evl.ms/fullstaq-ruby/tag/?page=#{page}&limit=100"
+          response = http.request request
+          body = JSON.parse(response.body)
+          tags += body['tags'].map {|tag| tag['name']}.grep /jemalloc-\w+-slim/
+          break unless body['has_additional']
+        end
+      end 
+          
+      ruby_releases = tags.group_by {|tag| tag.split('-').first}.
+        map do |release, tags|
+          [release, tags.max_by {|tag| debian_releases.find_index(tag[/jemalloc-(\w+)-slim/, 1]) || -1}]
+        end.sort.to_h
+
+      unless ruby_releases[@ruby_version]
+        @ruby_version = ruby_releases.keys.find {|release| release >= @ruby_version} ||
+          ruby_releases.keys.last
+      end
+
+      @image = 'quay.io/evl.ms/fullstaq-ruby:' + ruby_releases[@ruby_version]
+    end
+
     def generate_dockerfile
       if @eject or File.exist? 'Dockerfile'
         @dockerfile = 'Dockerfile'
@@ -137,6 +177,7 @@ module Fly
       end
 
       if @eject or not File.exist? @dockerfile
+        select_image
         app_template 'Dockerfile.erb', @dockerfile
       end
     end
@@ -173,7 +214,6 @@ module Fly
     end
 
     def generate_raketask
-      return unless @nomad
       app_template 'fly.rake.erb', 'lib/tasks/fly.rake'
     end
 
@@ -202,7 +242,7 @@ module Fly
     end
 
     def generate_patches
-      if @redis_cable and not @anycable and @redis != :internal and
+      if false # @redis_cable and not @anycable and @redis != :internal and
         not File.exist? 'config/initializers/action_cable.rb'
 
         app
@@ -260,7 +300,32 @@ module Fly
       cmd = "flyctl redis create --org #{org} --name #{app}-redis --region #{region} --no-replicas #{eviction} --plan #{@config.redis.plan}"
       say_status :run, cmd
       output = FlyIoRails::Utils.tee(cmd)
-      output[%r{redis://\S+}]
+      output[%r{redis://[-\w:@.]+}]
+    end
+
+    def bundle_gems
+      if @anycable and not @gemfile.include? 'anycable-rails'
+        cmd = 'bundle add anycable-rails'
+        say_status :run, cmd
+        open('Gemfile', 'a') {|f| f.puts "\n gem \"anycable-rails\""}
+        system 'bundle install'
+        exit $?.exitstatus unless $?.success?
+      end
+
+      if @postgresql and not @gemfile.include? 'pg'
+        cmd = 'bundle add pg'
+        say_status :run, cmd
+        open('Gemfile', 'a') {|f| f.puts "\n gem \"pg\""}
+        system 'bundle install'
+        exit $?.exitstatus unless $?.success?
+      end
+
+      if @redis and not @gemfile.include? 'redis'
+        cmd = 'bundle add redis'
+        say_status :run, cmd
+        system cmd
+        exit $?.exitstatus unless $?.success?
+      end
     end
 
     def release(app, options)
@@ -292,8 +357,9 @@ module Fly
           sleep 0.2
         end
 
-        exit_code = event&.dig(:request, :exit_event, :exit_code)
+        exit_code = event&.dig(:request, :MonitorEvent, :exit_event, :exit_code)
         Fly::Machines.delete_machine app, machine if machine
+        exit_code ||= 0 if event&.dig(:request, :MonitorEvent, :exit_event, :signal) == -1
         return event, exit_code, machine
       else
         return status, nil, nil
@@ -317,6 +383,16 @@ module Fly
           @volume = create_volume(app, @region, @config.sqlite3.size) 
         end
       elsif @postgresql and not secrets.include? 'DATABASE_URL'
+        unless (IO.read('config/fly.rb').include?('postgres') rescue true)
+          source_paths.each do |path|
+            template = File.join(path, 'fly.rb.erb')
+            next unless File.exist? template
+            insert = IO.read(template)[/<% if @postgresql -%>\n(.*?)<% end/m, 1]
+            append_to_file 'config/fly.rb', insert if insert
+            break
+          end
+        end
+
         secret = create_postgres(app, @org, @region,
           @config.postgres.vm_size,
           @config.postgres.volume_size,
@@ -343,6 +419,24 @@ module Fly
       end
     end
 
+    def release_task_defined?
+      if File.exist? 'lib/tasks/fly.rake'
+        Rake.load_rakefile 'lib/tasks/fly.rake'
+      else
+        Tempfile.create ['fly', '.rake'] do |file|
+          IO.write file.path, render('fly.rake.erb')
+          Rake.load_rakefile file.path
+        end
+      end
+
+      if Rake::Task.task_defined? 'fly:release'
+        task = Rake::Task['fly:release']
+        not (task.actions.empty? and task.prereqs.empty?)
+      else
+        false
+      end
+    end
+
     def deploy(app, image)
       launch(app)
 
@@ -366,16 +460,25 @@ module Fly
         ]
       }
 
+      # start proxy, if necessary
+      Fly::Machines::fly_api_hostname!
+
       # only run release step if there is a non-empty release task in fly.rake
-      if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
+      if release_task_defined?
         # build config for release machine, overriding server command
         release_config = config.dup
         release_config.delete :services
         release_config.delete :mounts
-        release_config[:env] = { 'SERVER_COMMAND' => 'bin/rails fly:release' }
+        release_config[:processes] = [{
+          name: 'release',
+          entrypoint: [],
+          cmd: ['bin/rails', 'fly:release'],
+          env: {},
+          user: 'root'
+        }]
 
         # perform release
-        say_status :fly, release_config[:env]['SERVER_COMMAND']
+        say_status :fly, 'bin/rails fly:release'
         event, exit_code, machine = release(app, region: @region, config: release_config)
 
         if exit_code != 0
@@ -386,9 +489,6 @@ module Fly
         end
       end
 
-      # start proxy, if necessary
-      endpoint = Fly::Machines::fly_api_hostname!
-
       # stop previous instances - list will fail on first run
       stdout, stderr, status = Open3.capture3('fly machines list --json')
       existing_machines = []
@@ -531,7 +631,7 @@ module Fly
       endpoint = Fly::Machines::fly_api_hostname!
 
       # perform release, if necessary
-      if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
+      if release_task_defined?
         say_status :fly, config[:env]['SERVER_COMMAND']
         event, exit_code, machine = release(app, region: @region, config: config)
       else

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

@@ -77,8 +77,11 @@ module Fly
 
       def initialize
         @config = {}
+        super
       end
 
+      option :image, nil
+
       block :machine, Machine
       block :postgres, Postgres
       block :redis, Redis

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

@@ -21,10 +21,10 @@ module Fly
       @@fly_api_hostname = '_api.internal:4280'
     rescue
       begin
-	Net::HTTP.get URI('http://127.0.0.1:4280')
-	@@fly_api_hostname = '127.0.0.1:4280'
+        Net::HTTP.get URI('http://127.0.0.1:4280')
+        @@fly_api_hostname = '127.0.0.1:4280'
       rescue
-	nil
+        nil
       end
     end
 
@@ -33,14 +33,14 @@ module Fly
       org = 'personal'
 
       if File.exist? 'fly.toml'
-	require 'toml'
-	app = TOML.load_file('fly.toml')['app']
+        require 'toml'
+        app = TOML.load_file('fly.toml')['app']
 
-	apps = JSON.parse(`flyctl list apps --json`) rescue []
+        apps = JSON.parse(`flyctl list apps --json`) rescue []
 
-	apps.each do |info|
-	  org = info['Organization'] if info['ID'] == app
-	end
+        apps.each do |info|
+          org = info['Organization'] if info['ID'] == app
+        end
       end
 
       org

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

@@ -31,7 +31,7 @@ module Fly
       end
 
       @sidekiq = @gemfile.include? 'sidekiq'
-      @anycable = @gemfile.include? 'anycable'
+      @anycable = @gemfile.include? 'anycable-rails'
       @rmagick = @gemfile.include? 'rmagick'
       @image_processing = @gemfile.include? 'image_processing'
       @bootstrap = @gemfile.include? 'bootstrap'
@@ -51,8 +51,11 @@ module Fly
 
       @cable = ! Dir['app/channels/*.rb'].empty?
 
-      if (YAML.load_file('config/cable.yml').dig('production', 'adapter') rescue false)
-        @redis_cable = @cable
+      if @cable
+        @redis_cable = true
+        if (YAML.load_file('config/cable.yml').dig('production', 'adapter') rescue '').include? 'any_cable'
+          @anycable = true
+        end
       end
 
       if (IO.read('config/environments/production.rb') =~ /redis/i rescue false)

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

@@ -16,22 +16,22 @@ module FlyIoRails
       data = []
 
       if defined? PTY
-	begin
-	  # PTY supports ANSI cursor control and colors
-	  PTY.spawn(cmd) do |read, write, pid|
-	    begin
-	      read.each do |line|
-		print line
-		data << line
-	      end
-	    rescue Errno::EIO
-	    end
-	  end
-	rescue PTY::ChildExited
-	end
+        begin
+          # PTY supports ANSI cursor control and colors
+          PTY.spawn(cmd) do |read, write, pid|
+            begin
+              read.each do |line|
+                print line
+                data << line
+              end
+            rescue Errno::EIO
+            end
+          end
+        rescue PTY::ChildExited
+        end
       else
-	# no support for ANSI cursor control and colors
-	Open3.popen2e(cmd) do |stdin, out, thread|
+        # no support for ANSI cursor control and colors
+        Open3.popen2e(cmd) do |stdin, out, thread|
           out.each do |line|
             print line
             data << line
@@ -43,8 +43,6 @@ module FlyIoRails
     end
 
     def create_app(name: nil, org: 'personal', regions: [], nomad: false, **rest)
-      return if File.exist? 'fly.toml'
-
       cmd = if name
         "flyctl apps create #{name.inspect} --org #{org.inspect} --machines"
       else

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/generators/fly/app_generator.rb

@@ -8,6 +8,7 @@ class AppGenerator < Rails::Generators::Base
   class_option :org, type: :string, default: 'personal'
   class_option :region, type: :array, repeatable: true, default: []
   class_option :nomad, type: :boolean, default: false
+  class_option :eject, type: :boolean, default: nil
 
   class_option :anycable, type: :boolean, default: false
   class_option :avahi, type: :boolean, default: false
@@ -22,30 +23,50 @@ class AppGenerator < Rails::Generators::Base
 
     # the plan is to make eject an option, default to false, but until
     # that is ready, have generate fly:app always eject
-    options = options.to_h.dup
-    options[:eject] = options[:nomad]
+    opts = options.to_h.symbolize_keys
+    opts[:eject] = opts[:nomad] if opts[:eject] == nil
 
-    create_app(**options.symbolize_keys)
+    if File.exist? 'fly.toml'
+      toml = TOML.load_file('fly.toml')
+      opts[:name] ||= toml['app']
+      apps = JSON.parse(`flyctl list apps --json`) rescue []
 
-    action = Fly::Actions.new(@app, options)
+      if toml.keys.length == 1
+        if opts[:name] != toml['app']
+          # replace existing fly.toml
+          File.unlink 'fly.toml'
+          create_app(**opts.symbolize_keys)
+        elsif not apps.any? {|item| item['ID'] == opts[:name]}
+          create_app(**opts.symbolize_keys)
+        end
+      elsif opts[:name] != toml['app']
+        say_status "fly:app", "Using the name in the existing toml file", :red
+        opts[:name] = toml['app']
+      end
+    else
+      create_app(**opts.symbolize_keys)
+    end
+
+    action = Fly::Actions.new(@app, opts)
 
     action.generate_toml
     action.generate_fly_config unless File.exist? 'config/fly.rb'
 
-    if options[:eject]
-      action.generate_dockerfile unless File.exist? 'Dockerfile'
+    if opts[:eject]
+      action.generate_dockerfile
       action.generate_dockerignore unless File.exist? '.dockerignore'
       action.generate_nginx_conf unless File.exist? 'config/nginx.conf'
       action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
       action.generate_procfile unless File.exist? 'Procfile.rake'
-      action.generate_litefs if options[:litefs] and not File.exist? 'config/litefs'
+      action.generate_litefs if opts[:litefs] and not File.exist? 'config/litefs'
       action.generate_patches
     end
 
-    action.generate_ipv4
-    action.generate_ipv6
+    ips = `flyctl ips list`.strip.lines[1..].map(&:split).map(&:first)
+    action.generate_ipv4 unless ips.include? 'v4'
+    action.generate_ipv6 unless ips.include? 'v6'
 
-    action.launch(@app)
+    action.launch(action.app)
   end
 end
 end

data/lib/generators/templates/Dockerfile.erb

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1
 
-FROM quay.io/evl.ms/fullstaq-ruby:<%= @ruby_version %>-jemalloc-slim as base
+FROM <%= @image %> as base
 LABEL fly_launch_runtime="rails"
 
 ENV RAILS_ENV=production
@@ -10,11 +10,7 @@ ENV RAILS_LOG_TO_STDOUT true
 <% unless @passenger -%>
 ENV RAILS_SERVE_STATIC_FILES true
 <% end -%>
-
-ARG BUNDLE_WITHOUT=development:test
-ARG BUNDLE_PATH=vendor/bundle
-ENV BUNDLE_PATH ${BUNDLE_PATH}
-ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
+ENV PORT 8080
 
 RUN mkdir /app
 WORKDIR /app
@@ -39,20 +35,17 @@ RUN gem update --system --no-document && \
 FROM base as build_deps
 
 <% 
-  @build_packages = %w(git build-essential wget vim curl gzip xz-utils)
+  @build_packages = %w(git build-essential wget curl gzip xz-utils)
   @build_packages << 'libpq-dev' if @postgresql
   @build_packages << 'libsqlite3-dev' if @sqlite3
   @build_packages << 'default-libmysqlclient-dev' if @mysql
   @build_packages += %w[pkg-config libmagickwand-dev] if @rmagick
 -%>
-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 \
     --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
     apt-get update -qq && \
-    apt-get install --no-install-recommends -y ${BUILD_PACKAGES} \
-    && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+    apt-get install --no-install-recommends --yes \
+    <%= @build_packages.join(' ') %>
 
 #######################################################################
 
@@ -61,7 +54,12 @@ RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
 FROM build_deps as gems
 
 COPY Gemfile* ./
-RUN bundle install && \
+RUN --mount=type=cache,id=dev-gem-cache,sharing=locked,target=/srv/vendor \
+    bundle config set app_config .bundle && \
+    bundle config set without 'development test' && \
+    bundle lock --add-platform x86_64-linux && \
+    bundle config set path /srv/vendor && \
+    bundle install && \
 <% if @redis and not @gemfile.include? 'redis' -%>
 <% @bundle_add = true -%>
     bundle add redis && \
@@ -70,7 +68,9 @@ RUN bundle install && \
 <% @bundle_add = true -%>
     bundle add pg && \
 <% end -%>
-    rm -rf vendor/bundle/ruby/*/cache
+    mkdir -p vendor && \
+    bundle config set path vendor && \
+    cp -ar /srv/vendor .
 
 <% if @node -%>
 #######################################################################
@@ -118,7 +118,7 @@ FROM base
 RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl && \
   curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | \
     gpg --dearmor > /etc/apt/trusted.gpg.d/phusion.gpg && \
-  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bullseye main > /etc/apt/sources.list.d/passenger.list'
+  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger $(sed -n 's/VERSION_CODENAME=\(.*\)$/\1/p' /etc/os-release) main > /etc/apt/sources.list.d/passenger.list'
 
 <% end -%>
 <% if @puppeteer -%>
@@ -127,10 +127,17 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
  && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
 
 <% end -%>
+<% if @postgresql -%>
+# add postgres repository
+RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(sed -n 's/VERSION_CODENAME=\(.*\)$/\1/p' /etc/os-release)-pgdg main" 14 > /etc/apt/sources.list.d/pgdg.list
+<% end -%>
+# nginx: <%= @nginx.inspect %>
 <%
-  @deploy_packages = %w(file vim curl gzip)
-  @deploy_packages += %w(nginx passenger libnginx-mod-http-passenger) if @passenger
-  @deploy_packages << 'postgresql-client' if @postgresql
+  @deploy_packages = []
+  @deploy_packages << 'nginx' if @nginx
+  @deploy_packages += %w(passenger libnginx-mod-http-passenger) if @passenger
+  @deploy_packages << 'postgresql-client-14' if @postgresql
   @deploy_packages << 'libsqlite3-0' if @sqlite3
   @deploy_packages << 'default-mysql-client' if @mysql
   @deploy_packages << 'google-chrome-stable' if @puppeteer
@@ -143,15 +150,11 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
   @deploy_packages << 'gettext-base' if @nats
   @deploy_packages += %w(avahi-daemon avahi-utils libnss-mdns) if @avahi
 -%>
-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 \
     --mount=type=cache,id=prod-apt-lib,sharing=locked,target=/var/lib/apt \
     apt-get update -qq && \
-    apt-get install --no-install-recommends -y \
-    ${DEPLOY_PACKAGES} \
-    && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+    apt-get install --no-install-recommends --yes \
+    <%= @deploy_packages.join(' ') %>
 
 <% if @redis == :internal -%>
 # configure redis
@@ -200,9 +203,11 @@ COPY --from=nats:latest /nats-server.conf /etc/nats/nats-server.conf
 # configure avahi for ipv6
 RUN sed -i 's/mdns4_minimal/mdns_minimal/' /etc/nsswitch.conf
 <% end -%>
+<% if @nginx -%>
 <% if @passenger -%>
 
 # configure nginx/passenger
+<% if @passenger -%>
 <% unless @avahi or @nats -%>
 COPY config/nginx.conf /etc/nginx/sites-available/rails.conf
 <% end -%>
@@ -224,7 +229,31 @@ RUN rm /etc/nginx/sites-enabled/default && \
 COPY config/hook_detached_process /etc/nginx/
 <% end -%>
 <% end -%>
+<% else -%>
+
+# configure nginx/passenger
+COPY <<-"EOF" /etc/nginx/sites-available/rails.conf
+<%= render 'nginx.conf.erb' %>
+EOF
+RUN rm /etc/nginx/sites-enabled/default && \
+    ln -s /etc/nginx/sites-available/rails.conf /etc/nginx/sites-enabled/
+<% end -%>
+<% end -%>
+
+<% if @procs.length > 1 and not @eject -%>
+# Define processes
+COPY <<-"EOF" ./Procfile.fly
+<%= render 'Procfile.fly.erb' %>
+EOF
+
+<% end -%>
+<% unless @eject -%>
+# Define tasks
+COPY <<-"EOF" ./lib/tasks/fly.rake
+<%= render 'fly.rake.erb' %>
+EOF
 
+<% end -%>
 # Deploy your application
 COPY . .
 <% if @bundle_add -%>
@@ -233,26 +262,17 @@ COPY --from=gems /app/Gemfile* ./
 
 # Adjust binstubs to run on Linux and set current working directory
 RUN chmod +x /app/bin/* && \
-    sed -i 's/ruby.exe/ruby/' /app/bin/* && \
+    sed -i 's/ruby.exe/ruby\r*/' /app/bin/* && \
     sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /app/bin/*
 
-# The following enable assets to precompile on the build server.  Adjust
-# as necessary.  If no combination works for you, see:
-# https://fly.io/docs/rails/getting-started/existing/#access-to-environment-variables-at-build-time
-ENV SECRET_KEY_BASE 1
-# ENV AWS_ACCESS_KEY_ID=1
-# ENV AWS_SECRET_ACCESS_KEY=1
-
-# Run build task defined in lib/tasks/fly.rake
-ARG BUILD_COMMAND="bin/rails fly:build"
-RUN ${BUILD_COMMAND}
+# Run build task defined in config/fly.rb
+RUN SECRET_KEY_BASE=1 bin/rails fly:build
 
-# 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}
+# Start server
+<% if @litefs
+    @server_command="litefs"
+  else
+    @server_command="bin/rails fly:server"
+  end
+-%>
+CMD <%= @server_command.split(' ').inspect %>

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

@@ -45,14 +45,16 @@ namespace :fly do
     deps << 'db:migrate' if @sqlite3
     deps = deps.first if deps.length == 1
 
-    if @procs.length > 1
+    if @procs.length > 1 and (@avahi or @nats)
       "task :server, [:formation] => #{deps.inspect} do |task, args|"
     else
       "task :server => #{deps.inspect} do"
     end
   end %>
+  rm_f 'tmp/pids/server.pid' if File.exist? 'tmp/pids/server.pid'
   <%- if @procs.length > 1 -%>
-    <%- if @passenger and (@avahi or @nats) -%>
+    <%- if @avahi or @nats -%>
+    <%- if @passenger -%>
     sh 'envsubst < config/nginx.conf > /etc/nginx/sites-available/rails.conf'
     <%- end -%>
     formation = args[:formation].gsub!(';', ',')
@@ -63,11 +65,14 @@ namespace :fly do
     Rake::Task['fly:nats_publish'].invoke(formation) if ENV['NATS_SERVER']
     <%- end -%>
     Bundler.with_original_env do
-      <%- if @avahi or @nats -%>
       Rake::Task['fly:env'].invoke
-      <%- end -%>
       sh "foreman start --procfile=Procfile.fly --formation=#{formation}"
     end
+    <%- else -%>
+    Bundler.with_original_env do
+      sh "foreman start --procfile=Procfile.fly"
+    end
+    <%- end -%>
   <%- else -%>
     sh <%= @procs.values.first.inspect %>
   <%- end -%>

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

@@ -1,3 +1,5 @@
+image <%= @image.inspect %>
+
 machine do
   cpus 1
   cpu_kind 'shared'
@@ -23,11 +25,3 @@ redis do
   plan "Free"
 end
 <% end -%>
-
-<% unless @nomad -%>
-<%=
-  rakefile = File.expand_path('fly.rake.erb', __dir__)
-  template = ERB.new(IO.read(File.expand_path('fly.rake.erb', __dir__)), trim_mode: '-')
-  template.result(binding)
-%>
-<% end -%>

data/lib/generators/templates/nginx.conf.erb

@@ -1,3 +1,4 @@
+<% if @passenger -%>
 <% if @serverless -%>
 passenger_ctl hook_detached_process /etc/nginx/hook_detached_process;
 passenger_min_instances 0;
@@ -53,3 +54,24 @@ server {
     # to file uploads. The following line enables uploads of up to 50 MB:
     client_max_body_size 50M;
 }
+<% else -%>
+server {
+    listen 8080 default_server;
+    listen [::]:8080 default_server;
+
+<% if @anycable -%>
+    location /cable {
+        proxy_pass http://localhost:8082/cable;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
+
+<% end -%>
+    location / {
+        proxy_pass http://localhost:8081/;
+        proxy_set_header origin 'https://localhost:8081';
+    }
+}
+<% end -%>

data/lib/tasks/fly.rake

@@ -28,8 +28,9 @@ namespace :fly do
     action.generate_fly_config unless File.exist? 'config/fly.rb'
     action.generate_dockerfile
     action.generate_dockerignore
-    action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
-    action.generate_procfile unless File.exist? 'Procfile.fly'
+
+    # look for missing gems
+    action.bundle_gems
 
     # build and push an image
     out = FlyIoRails::Utils.tee "flyctl deploy --build-only --push --dockerfile #{action.dockerfile} --ignorefile #{action.ignorefile}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Rails support for Fly-io