fly.io-rails 0.1.9-x86-linux → 0.1.11-x86-linux

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e086ac52aa5d1a6a228015351b131bda022911c520f7568c5aad7d42a3e21a0d
4
- data.tar.gz: 9e0b11d7dccc4922ee10a192ff616c6e28fe64795d8ed056d4af89ce8c852496
3
+ metadata.gz: 20c0510dac9214e765c261c833910ded27a1eee6664fcfca4912c71eb5bee94b
4
+ data.tar.gz: 64cdd24da1cfe9e1cd8d0b12f53e0f42fbcd8395c3aaeb3784c3708c3879f1b6
5
5
  SHA512:
6
- metadata.gz: 6e55434f3498cab0d3d263b4324e7a5ed2076559a695343ee6aa2fd4c1b32211e5e47067ae8e94da59ba298d6226078a1ea8fa6068a9e65d658fcf8be3839030
7
- data.tar.gz: 1312f3ae42cfa9901241d026511241ec2b523d175813bd0467f89ee8530d4c041559435d39638d64254c976657d90393d707fa5725697d4e184f60b5b70f4820
6
+ metadata.gz: 7f41deeaf620d81fe2cff515a3be2de599a7c501d5bfc748b8987588b3319635dea518ae5efa8d03ec722466e59aad48d82777160f60a91e81b68e5777380f7e
7
+ data.tar.gz: f73a568a0b4853949ea61a0614a15c147ade72d0c73d9d7777e293cfbcfdd6329b020bf7561b0b657945dbffb2c4daf9281fc3b50706d710967c2261b456e828
@@ -94,8 +94,8 @@ module Fly
94
94
  @procs[:web] = "nginx -g 'daemon off;'" if @passenger
95
95
  @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
96
96
  @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis
97
- @procs.merge! 'anycable-rpc': 'bundle exec anycable',
98
- 'anycable-go': '/usr/local/bin/anycable-go --port=8082' if @anycable
97
+ @procs.merge! 'anycable-rpc': 'bundle exec anycable --rpc-host=0.0.0.0:50051',
98
+ 'anycable-go': 'env ANYCABLE_RPC_HOST=$ANYCABLE_GO_RPC_HOST /usr/local/bin/anycable-go --port=8082 --host 0.0.0.0' if @anycable
99
99
  end
100
100
 
101
101
  def app
@@ -1,3 +1,3 @@
1
1
  module Fly_io
2
- VERSION = '0.1.9'
2
+ VERSION = '0.1.11'
3
3
  end
@@ -108,7 +108,16 @@ RUN npm install
108
108
  FROM flyio/litefs:pr-109 AS litefs
109
109
 
110
110
  #######################################################################
111
- <% end %>
111
+ <% end -%>
112
+ <% if @anycable -%>
113
+
114
+ # Build anycable
115
+ FROM golang:1.18 as go
116
+ RUN GOBIN=/usr/local/bin/ go install github.com/anycable/anycable-go/cmd/anycable-go@latest
117
+
118
+ #######################################################################
119
+ <% end -%>
120
+
112
121
  # install deployment packages
113
122
 
114
123
  FROM base
@@ -141,14 +150,11 @@ RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
141
150
  ${DEPLOY_PACKAGES} \
142
151
  && rm -rf /var/lib/apt/lists /var/cache/apt/archives
143
152
 
144
- <% if @anycable -%>
145
- # install anycable
146
- 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
147
-
148
- <% end -%>
149
153
  <% if @redis == :internal -%>
150
154
  # configure redis
151
155
  RUN sed -i 's/^daemonize yes/daemonize no/' /etc/redis/redis.conf &&\
156
+ sed -i 's/^bind/# bind/' /etc/redis/redis.conf &&\
157
+ sed -i 's/^protected-mode yes/protected-mode no/' /etc/redis/redis.conf &&\
152
158
  sed -i 's/^logfile/# logfile/' /etc/redis/redis.conf
153
159
 
154
160
  <% end -%>
@@ -161,6 +167,11 @@ COPY --from=gems /usr/local/bundle /usr/local/bundle
161
167
  # copy installed node modules
162
168
  COPY --from=node_modules /app/node_modules /app/node_modules
163
169
 
170
+ <% end -%>
171
+ <% if @anycable -%>
172
+ # copy anycable-go
173
+ COPY --from=go /usr/local/bin/anycable-go /usr/local/bin/anycable-go
174
+
164
175
  <% end -%>
165
176
  <% if @litefs -%>
166
177
  # copy litefs binary
@@ -24,8 +24,7 @@ namespace :fly do
24
24
  ENV['REDIS_URL'] = "redis://#{ENV['FLY_REGION']}-redis.local:6379/1"
25
25
  <% end -%>
26
26
  <% if @anycable -%>
27
- ENV['ANYCABLE_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
28
- ENV['CABLE_URL'] = "#{ENV['FLY_REGION']}-anycable-go.local"
27
+ ENV['ANYCABLE_GO_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
29
28
  <% end -%>
30
29
  end
31
30
 
@@ -54,7 +53,7 @@ namespace :fly do
54
53
  <%- end -%>
55
54
  Bundler.with_original_env do
56
55
  <%- if @avahi -%>
57
- # Rake::Task['fly:env'].invoke
56
+ Rake::Task['fly:env'].invoke
58
57
  <%- end -%>
59
58
  sh "foreman start --procfile=Procfile.fly --formation=#{formation}"
60
59
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fly.io-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.9
4
+ version: 0.1.11
5
5
  platform: x86-linux
6
6
  authors:
7
7
  - Sam Ruby
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-10-13 00:00:00.000000000 Z
11
+ date: 2022-10-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fly-ruby