dockerfile-rails 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdeba5d0ed37dcc3153aeacdb439a1b43f24581f0503f64bb6c21ab1efaeb2e6
-  data.tar.gz: ea2818e2996d68abb56c7ccd8edb50647bcdf17a27012b4438014a266f4b98ef
+  metadata.gz: b2f3045de59d0f73629e9a4e8fde156434157a03efb44f2ea0e6ad635ea4de5a
+  data.tar.gz: a39d31017f8c73bd9235336c06d3a3ee79e5ec4b48b5b284ea163d5d101475f0
 SHA512:
-  metadata.gz: bd6911007a0945277da47cc4df5683a55aeb0e6ab834ce37fdbc91bd17a1ec310ae25d00c0167089b70394ccd24e79762136020309105b4894751bfcd05d49dc
-  data.tar.gz: 7ff6b8d79e2992b87c8b8fbec8f11f787bfe56ab32d176157f5d4251b6a3b82e1c7f78f00af85a61770a865fd6e871c6441540b69baa49f216589049f2e338a0
+  metadata.gz: 86d23b99ea73ec3189ca25668769a6f390b8a11d6efbfcd9812f24cd0170f9e01323d440d7ebdd2a42233c76707fd5c781e7697b939f3d0ba22272220c91e844
+  data.tar.gz: 97ac9c940d08683a6ce1c086112d76ace43c275c32604a64bf6974b353220ebaa783ab5665c1b2ceb3091b2ba56dc0ad5d2b70addf106be3fffdd2587abe2c75

data/lib/generators/dockerfile_generator.rb

@@ -388,18 +388,18 @@ private
   end
 
   def node_version
-    if File.exist? '.node-version'
-      IO.read('.node-version')[/\d+\.\d+\.\d+/]
-    else
-      version = nil
+    version = nil
 
-      if File.exist? 'package.json'
-        version = JSON.parse(IO.read('package.json')).dig("engines", "node")
-        version = nil unless version =~ /\A(\d+\.)+(\d+|x)\z/
-      end
+    if File.exist? '.node-version'
+      version = IO.read('.node-version')[/\d+\.\d+\.\d+/]
+    end
 
-      version || `node --version`[/\d+\.\d+\.\d+/]
+    if !version and File.exist? 'package.json'
+      version = JSON.parse(IO.read('package.json')).dig("engines", "node")
+      version = nil unless version =~ /\A(\d+\.)+(\d+|x)\z/
     end
+
+    version || `node --version`[/\d+\.\d+\.\d+/]
   rescue
     "lts" 
   end

data/lib/generators/templates/_nginx.erb

@@ -0,0 +1,31 @@
+# configure nginx
+RUN sed -i 's/access_log\s.*;/access_log \/dev\/stdout main;/' /etc/nginx/nginx.conf && \
+    sed -i 's/error_log\s.*;/error_log \/dev\/stderr info;/' /etc/nginx/nginx.conf && \
+    sed -i "/access_log/i\ \n\tlog_format main '\$http_fly_client_ip - \$remote_user [\$time_local] "\$request" '\n\t'\$status \$body_bytes_sent \"\$http_referer\" \"\$http_user_agent\"';" /etc/nginx/nginx.conf
+
+COPY <<-"EOF" /etc/nginx/sites-available/default
+server {
+  listen 3000 default_server;
+  listen [::]:3000 default_server;
+  access_log /dev/stdout;
+
+  root /rails/public;
+
+  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;
+  }
+
+  location / {
+    try_files $uri @backend;
+  }
+
+  location @backend {
+    proxy_pass http://localhost:3001;
+    proxy_set_header origin 'http://localhost:3000';
+  }
+}
+EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,6 +40,7 @@ files:
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/_apt_install.erb
 - lib/generators/templates/_install_node.erb
+- lib/generators/templates/_nginx.erb
 - lib/generators/templates/_node_client.erb
 - lib/generators/templates/_npm_install.erb
 - lib/generators/templates/docker-compose.yml.erb