Merge pull request #714 from NREL/passenger_upgrade

Passenger upgrade
NREL · Sep 18, 2023 · bcecf3c · bcecf3c
2 parents dab7e56 + e9a78c6
commit bcecf3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -59,7 +59,7 @@ RUN apt-get update && apt-get install -y wget gnupg \
     && rm -rf /var/lib/apt/lists/*
 
 # Install passenger (this also installs nginx)
-ENV PASSENGER_VERSION 6.0.2
+ENV PASSENGER_VERSION 6.0.18
 
 RUN gem install passenger -v $PASSENGER_VERSION
 RUN passenger-install-nginx-module
@@ -104,7 +104,7 @@ RUN bundle exec rake assets:precompile
 # Bundle app source
 ADD /server /opt/openstudio/server
 # Add in /spec for testing 
-#ADD /spec /opt/openstudio/spec
+#ADD /server/spec /opt/openstudio/server/spec
 ADD .rubocop.yml /opt/openstudio/.rubocop.yml
 # Run bundle again, because if the user has a local Gemfile.lock it will have been overriden
 RUN rm Gemfile.lock

diff --git a/docker/server/nginx.conf b/docker/server/nginx.conf
@@ -1,14 +1,14 @@
 daemon off;
 user nobody nogroup;
-worker_processes 1;
+worker_processes auto;
 error_log /dev/stderr;
 
 events {
     worker_connections 1024;
 }
 
 http {
-    passenger_root /usr/local/lib/ruby/gems/2.7.0/gems/passenger-6.0.2;
+    passenger_root /usr/local/lib/ruby/gems/2.7.0/gems/passenger-6.0.18;
     passenger_ruby /usr/local/bin/ruby;
     passenger_friendly_error_pages on;