dockerfile-rails 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e294d1eb49539e4b311a2f7d8895d71b7349cc09cee142dca45b05aee801eeb
-  data.tar.gz: 84dc33ff8a2802b7aa5cd26054682ba9f2c0b05f2ebf37f68c46bc6c58eed79c
+  metadata.gz: b2f3045de59d0f73629e9a4e8fde156434157a03efb44f2ea0e6ad635ea4de5a
+  data.tar.gz: a39d31017f8c73bd9235336c06d3a3ee79e5ec4b48b5b284ea163d5d101475f0
 SHA512:
-  metadata.gz: 95831ef858c0c76aa5a154d90f0db03a83d11542fedf20827e0aec6c15a14034b5fbd1de77103a083f65a8d1d5398e560f56b8d6bda0e6079b84f803e9f64509
-  data.tar.gz: '08d287f97d9f55b8452eba24d3d9cad80a4b7703c505bbaae814de520d4fbea044e3ec7eb9352e8c5f8b455dbd4b392beab946d21b286ee4aaf8b8ca3ece5c63'
+  metadata.gz: 86d23b99ea73ec3189ca25668769a6f390b8a11d6efbfcd9812f24cd0170f9e01323d440d7ebdd2a42233c76707fd5c781e7697b939f3d0ba22272220c91e844
+  data.tar.gz: 97ac9c940d08683a6ce1c086112d76ace43c275c32604a64bf6974b353220ebaa783ab5665c1b2ceb3091b2ba56dc0ad5d2b70addf106be3fffdd2587abe2c75

data/lib/generators/dockerfile_generator.rb

@@ -104,7 +104,9 @@ class DockerfileGenerator < Rails::Generators::Base
     template 'Dockerfile.erb', 'Dockerfile'
     template 'dockerignore.erb', '.dockerignore'
 
-    template 'node-version.erb', '.node-version' if using_node?
+    if using_node? and node_version =~ /\A\d+\.\d+\.\d+\z/
+      template 'node-version.erb', '.node-version' 
+    end
 
     template 'docker-entrypoint.erb', 'bin/docker-entrypoint'
     chmod "bin/docker-entrypoint", 0755 & ~File.umask, verbose: false
@@ -386,11 +388,18 @@ private
   end
 
   def node_version
-    if File.exist? '.node_version'
-      IO.read('.node_version')[/\d+\.\d+\.\d+/]
-    else
-      `node --version`[/\d+\.\d+\.\d+/]
+    version = nil
+
+    if File.exist? '.node-version'
+      version = IO.read('.node-version')[/\d+\.\d+\.\d+/]
     end
+
+    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.6
+  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