diff --git a/Dockerfile b/Dockerfile index 13bc702ed..222f8c925 100644 --- 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 index c9d6bbd33..bbaca21df 100644 --- a/docker/server/nginx.conf +++ b/docker/server/nginx.conf @@ -1,6 +1,6 @@ daemon off; user nobody nogroup; -worker_processes 1; +worker_processes auto; error_log /dev/stderr; events { @@ -8,7 +8,7 @@ events { } 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;