fly.io-rails 0.0.11-x86_64-darwin → 0.0.12-x86_64-darwin
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fly.io-rails/version.rb +1 -1
- data/lib/generators/templates/Dockerfile.erb +31 -0
- data/lib/generators/terraform_generator.rb +4 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2029b7fba3b5f493abe43cc9fe6ec8705fbc7788d066ceaac6ee828291bf33ba
|
|
4
|
+
data.tar.gz: 8ee1149b514a16af4b1704f1de01fd9daf27290289eba2d6b870b415e273d493
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ddd18e2a75f0e75263c07b9187d7a89429fe64f8beda9e9090314cf8d326dbcd8f15aa13e2ee2cc1def30c638614e514ab6c4ed572ad465484538e1752de7d46
|
|
7
|
+
data.tar.gz: 78ccfc36e20a979a165daaa19fd0381893ed0f32b6c57620eeb571fa2cc216da28ad725dfaa6cacf63b19c1117c50f4c82a23adb887e15270090070e6c1e8652
|
data/lib/fly.io-rails/version.rb
CHANGED
|
@@ -21,6 +21,9 @@ ARG RUBY_VERSION=<%= @ruby_version %>
|
|
|
21
21
|
ARG VARIANT=jemalloc-slim
|
|
22
22
|
FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base
|
|
23
23
|
|
|
24
|
+
<% if @node -%>
|
|
25
|
+
ARG NODE_VERSION=<%= @node_version %>
|
|
26
|
+
<% end -%>
|
|
24
27
|
ARG BUNDLER_VERSION=<%= @bundler_version %>
|
|
25
28
|
|
|
26
29
|
ARG RAILS_ENV=production
|
|
@@ -38,6 +41,13 @@ RUN mkdir /app
|
|
|
38
41
|
WORKDIR /app
|
|
39
42
|
RUN mkdir -p tmp/pids
|
|
40
43
|
|
|
44
|
+
<% if @node -%>
|
|
45
|
+
RUN curl https://get.volta.sh | bash
|
|
46
|
+
ENV VOLTA_HOME /root/.volta
|
|
47
|
+
ENV PATH $VOLTA_HOME/bin:/usr/local/bin:$PATH
|
|
48
|
+
RUN volta install node@${NODE_VERSION}
|
|
49
|
+
|
|
50
|
+
<% end -%>
|
|
41
51
|
#######################################################################
|
|
42
52
|
|
|
43
53
|
# install packages only needed at build time
|
|
@@ -65,6 +75,22 @@ RUN gem update --system --no-document && \
|
|
|
65
75
|
COPY Gemfile* ./
|
|
66
76
|
RUN bundle install && rm -rf vendor/bundle/ruby/*/cache
|
|
67
77
|
|
|
78
|
+
<% if @node -%>
|
|
79
|
+
#######################################################################
|
|
80
|
+
|
|
81
|
+
# install node modules
|
|
82
|
+
|
|
83
|
+
FROM build_deps as node_modules
|
|
84
|
+
|
|
85
|
+
COPY package*json ./
|
|
86
|
+
<% if @yarn -%>
|
|
87
|
+
COPY yarn.* ./
|
|
88
|
+
RUN volta install yarn && yarn install;
|
|
89
|
+
<% else -%>
|
|
90
|
+
RUN npm install
|
|
91
|
+
<% end -%>
|
|
92
|
+
|
|
93
|
+
<% end -%>
|
|
68
94
|
#######################################################################
|
|
69
95
|
|
|
70
96
|
# install deployment packages
|
|
@@ -86,6 +112,11 @@ COPY --from=gems /app /app
|
|
|
86
112
|
COPY --from=gems /usr/lib/fullstaq-ruby/versions /usr/lib/fullstaq-ruby/versions
|
|
87
113
|
COPY --from=gems /usr/local/bundle /usr/local/bundle
|
|
88
114
|
|
|
115
|
+
<% if @node -%>
|
|
116
|
+
# copy installed node modules
|
|
117
|
+
COPY --from=node_modules /app/node_modules /app/node_modules
|
|
118
|
+
|
|
119
|
+
<% end -%>
|
|
89
120
|
#######################################################################
|
|
90
121
|
|
|
91
122
|
# Deploy your application
|
|
@@ -31,7 +31,11 @@ class TerraformGenerator < Rails::Generators::Base
|
|
|
31
31
|
|
|
32
32
|
@ruby_version = RUBY_VERSION
|
|
33
33
|
@bundler_version = Bundler::VERSION
|
|
34
|
+
@node = File.exist? 'node_modules'
|
|
35
|
+
@yarn = File.exist? 'yarn.lock'
|
|
36
|
+
@node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
|
|
34
37
|
@appName = @app.gsub('-', '_').camelcase(:lower)
|
|
38
|
+
|
|
35
39
|
template 'Dockerfile.erb', 'Dockerfile'
|
|
36
40
|
template 'dockerignore.erb', '.dockerignore'
|
|
37
41
|
template 'main.tf.erb', 'main.tf'
|