Skip to content

Commit

Permalink
Merge pull request #714 from NREL/passenger_upgrade
Browse files Browse the repository at this point in the history
Passenger upgrade
  • Loading branch information
brianlball authored Sep 18, 2023
2 parents dab7e56 + e9a78c6 commit bcecf3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/server/nginx.conf
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit bcecf3c

Please sign in to comment.