fly.io-rails 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5607b08f46147018d9b5915b484ccb3d20f76a662aee1b381d5576cfc9e6b5f9
-  data.tar.gz: 0e7ae042c84afd01f3fa6ab90dab72a4720b7f5e816d9859c59007ebad06635b
+  metadata.gz: cabb5f37f0dd4bbec717d8490cd9d94b736373ae9227a92eb0c26e7ac0d2e0b9
+  data.tar.gz: acb4bd5973ad7736266c1a3b357587534aa3a023804ccf9ee26a6204ca032c68
 SHA512:
-  metadata.gz: 1849e0cca1382bc6df929ab82a777bbe9586be9bf6ad6b26e2fe5f8942fc43ef8661c8ea46cddafb53eb6997f7b1ff4611b2f4ecbd896a2fe5160aaf77ad6077
-  data.tar.gz: 13ceffa34870da0b65bbb16d488d730e12e9592f6862cb50d594f9bf034dda62f8251ea6878634b8a682b1c060dbbefb63f3484bd9411c3cba4fe462e0b54f2a
+  metadata.gz: 11199be3467dcf32923d67804bae749af69f8b1c041641690cdb8b4e72e4e4f84a742cce06b6d98ab64a975f74c778a20a1d829eff72290da15c9eb5f78050b8
+  data.tar.gz: c7adb212a71b16dcf7bdcd0b413b2c7b1a224561627f5754c011b8341bb5740a175b9da63d53a83e069224ffd1a7ee656ffca231eda18f2f18c615d68fd17804

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

@@ -94,8 +94,8 @@ module Fly
       @procs[:web] = "nginx -g 'daemon off;'" if @passenger
       @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
       @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis
-      @procs.merge! 'anycable-rpc': 'bundle exec anycable',
-        'anycable-go': '/usr/local/bin/anycable-go --port=8082' if @anycable
+      @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
     end
 
     def app

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end

data/lib/generators/templates/Dockerfile.erb

@@ -108,7 +108,16 @@ RUN npm install
 FROM flyio/litefs:pr-109 AS litefs
 
 #######################################################################
-<% end %>
+<% end -%>
+<% if @anycable -%>
+
+# Build anycable
+FROM golang:1.18 as go
+RUN GOBIN=/usr/local/bin/ go install github.com/anycable/anycable-go/cmd/anycable-go@latest
+
+#######################################################################
+<% end -%>
+
 # install deployment packages
 
 FROM base
@@ -141,14 +150,11 @@ RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
     ${DEPLOY_PACKAGES} \
     && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
-<% if @anycable -%>
-# install anycable
-RUN curl -L https://github.com/anycable/anycable-go/releases/download/v1.2.1/anycable-go-linux-amd64 -o /usr/local/bin/anycable-go && chmod 755 /usr/local/bin/anycable-go
-
-<% end -%>
 <% if @redis == :internal -%>
 # configure redis
 RUN sed -i 's/^daemonize yes/daemonize no/' /etc/redis/redis.conf &&\
+  sed -i 's/^bind/# bind/' /etc/redis/redis.conf &&\
+  sed -i 's/^protected-mode yes/protected-mode no/' /etc/redis/redis.conf &&\
   sed -i 's/^logfile/# logfile/' /etc/redis/redis.conf 
 
 <% end -%>
@@ -161,6 +167,11 @@ 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 @anycable -%>
+# copy anycable-go
+COPY --from=go /usr/local/bin/anycable-go /usr/local/bin/anycable-go
+
 <% end -%>
 <% if @litefs -%>
 # copy litefs binary

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

@@ -24,8 +24,7 @@ namespace :fly do
     ENV['REDIS_URL'] = "redis://#{ENV['FLY_REGION']}-redis.local:6379/1"
 <% end -%>
 <% if @anycable -%>
-    ENV['ANYCABLE_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
-    ENV['CABLE_URL'] = "#{ENV['FLY_REGION']}-anycable-go.local"
+    ENV['ANYCABLE_GO_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
 <% end -%>
   end
 
@@ -54,7 +53,7 @@ namespace :fly do
     <%- end -%>
     Bundler.with_original_env do
       <%- if @avahi -%>
-      # Rake::Task['fly:env'].invoke
+      Rake::Task['fly:env'].invoke
       <%- end -%>
       sh "foreman start --procfile=Procfile.fly --formation=#{formation}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby