Skip to content

Commit

Permalink
Merge pull request #232 from mlibrary/disable-rackup
Browse files Browse the repository at this point in the history
Disable rackup
  • Loading branch information
niquerio authored Aug 31, 2022
2 parents 963e823 + c69aa77 commit 21c7425
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ RUN npm ci
RUN npm run build-css
RUN npm run build-js

CMD ["bundle", "exec", "rackup", "-p", "4567", "--host", "0.0.0.0"]
CMD ["bundle", "exec", "ruby", "account.rb", "-o", "0.0.0.0"]
7 changes: 3 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ services:
command:
- bundle
- exec
- rackup
- -p
- "4567"
- --host
- ruby
- account.rb
- -o
- 0.0.0.0

nelnet-test:
Expand Down
28 changes: 14 additions & 14 deletions nelnet_test/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
multi_json (1.15.0)
mustermann (1.1.1)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
public_suffix (4.0.6)
rack (2.2.3)
rack-protection (2.2.0)
public_suffix (5.0.0)
rack (2.2.4)
rack-protection (2.2.2)
rack
ruby2_keywords (0.0.5)
sinatra (2.2.0)
mustermann (~> 1.0)
sinatra (2.2.2)
mustermann (~> 2.0)
rack (~> 2.2)
rack-protection (= 2.2.0)
rack-protection (= 2.2.2)
tilt (~> 2.0)
sinatra-contrib (2.2.0)
sinatra-contrib (2.2.2)
multi_json
mustermann (~> 1.0)
rack-protection (= 2.2.0)
sinatra (= 2.2.0)
mustermann (~> 2.0)
rack-protection (= 2.2.2)
sinatra (= 2.2.2)
tilt (~> 2.0)
tilt (2.0.10)
tilt (2.0.11)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
require "simplecov"
require "climate_control"
SimpleCov.start
ENV["RACK_ENV"] = "test"
ENV["APP_ENV"] = "test"

require File.expand_path "../../account.rb", __FILE__
OmniAuth.config.test_mode = true
Expand Down

0 comments on commit 21c7425

Please sign in to comment.