lib/generators/templates/_nginx.erb in dockerfile-rails-1.5.2 vs lib/generators/templates/_nginx.erb in dockerfile-rails-1.5.3

- old
+ new

@@ -1,18 +1,18 @@ # configure nginx RUN gem install foreman && \ <% unless run_as_root? -%> sed -i 's|pid /run|pid /rails/tmp/pids|' /etc/nginx/nginx.conf && \ <% end -%> - sed -i 's/access_log\s.*;/access_log stdout;/' /etc/nginx/nginx.conf && \ - sed -i 's/error_log\s.*;/error_log stderr info;/' /etc/nginx/nginx.conf + sed -i 's/access_log\s.*;/access_log <% unless run_as_root? %>\/dev\/<% end %>stdout;/' /etc/nginx/nginx.conf && \ + sed -i 's/error_log\s.*;/error_log <% unless run_as_root? %>\/dev\/<% end %>stderr info;/' /etc/nginx/nginx.conf COPY <<-"EOF" /etc/nginx/sites-available/default server { listen 3000 default_server; listen [::]:3000 default_server; - access_log stdout; + access_log <% unless run_as_root? %>/dev/<% end %>stdout; root /rails/public; location /cable { proxy_pass http://localhost:8082/cable; @@ -26,9 +26,9 @@ try_files $uri @backend; } location @backend { proxy_pass http://localhost:3001; - proxy_set_header origin 'http://localhost:3000'; + proxy_set_header Host $http_host; } } EOF