fly.io-rails 0.1.10-x86-linux → 0.1.12-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903316a2bb742598eb64548b5f9e787019484ecab880b414d98c729aa33552c1
-  data.tar.gz: 1c93720c5631c1ee060d351db5acb6572fe020cb396de2a65b3a8a18b30778d7
+  metadata.gz: 88005e2d877f216d20a8f496a3adef79b117e0f960d1c64a5a51f697f0eabded
+  data.tar.gz: fa536f472eb5485df0b7953e6ff7dcc99a826b66b54d0670fbc0565d7fbe021d
 SHA512:
-  metadata.gz: 717fa4b1202feb23d5984b31755ef3ad770c69f9fb82da8db3b9b285d8090975f17a595f4da4f98c55c9d317e3197b0d5d035a570e06ebd279fe28f5fa0868b1
-  data.tar.gz: 442608ea68313ddbcc10ca7ca45e06629d9517891424d2d4a76dcddc6c0275ce997cdcefad5defc29fbdb0724d103822ff69735de3880e387d1e5286bb038493
+  metadata.gz: 6125a3853b345acb69e45802a9a1ac939d55f363ab000cba012b785b5f18e2b823244d478eb603c178facd4da3c9bd9062201c0f7e5b9e4190812236bce54778
+  data.tar.gz: 49de61630f1ea6e631ec3d5333b2d854e7a4543af38a426e5279255a750f923cd12a9fe6a8f0a887cd5650fd09a4d9b52f4e14aba616877c219d23840e6bffaf

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/scanner.rb

@@ -10,6 +10,8 @@ module Fly
         @sqlite3 = true
       elsif database == 'postgresql'
         @postgresql = true
+      elsif database == 'mysql' or database == 'mysql2'
+        @mysql = true
       end
 
       gemfile = IO.read('Gemfile') rescue ''

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.10'
+  VERSION = '0.1.12'
 end

data/lib/generators/templates/Dockerfile.erb

@@ -63,6 +63,7 @@ FROM base as build_deps
   @build_packages = %w(git build-essential wget vim curl gzip xz-utils)
   @build_packages << 'libpq-dev' if @postgresql
   @build_packages << 'libsqlite3-dev' if @sqlite3
+  @build_packages << 'default-libmysqlclient-dev' if @mysql
 -%>
 ARG BUILD_PACKAGES=<%= @build_packages.join(' ').inspect %>
 ENV BUILD_PACKAGES ${BUILD_PACKAGES}
@@ -108,7 +109,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
@@ -126,6 +136,7 @@ RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl &&
   @deploy_packages += %w(nginx passenger libnginx-mod-http-passenger) if @passenger
   @deploy_packages << 'postgresql-client' if @postgresql
   @deploy_packages << 'libsqlite3-0' if @sqlite3
+  @deploy_packages << 'default-mysql-client' if @mysql
   @deploy_packages << 'fuse' if @litefs
   @deploy_packages << 'ruby-foreman' if @procs.length > 1
   @deploy_packages << 'redis-server' if @redis == :internal
@@ -141,11 +152,6 @@ 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 &&\
@@ -163,6 +169,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.10
+  version: 0.1.12
 platform: x86-linux
 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