Skip to content

ETT-57 puma/rack displays "development" environment in Argo #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 6, 2025
Merged

ETT-57 puma/rack displays "development" environment in Argo #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2516537
ETT-57 puma/rack displays "development" environment in Argo
moseshll Jun 5, 2025
5e7a966
Set logging to true (that's what Holdings API is doing).
moseshll Jun 5, 2025
b4a028f
`bundle update` to address three Dependabots.
moseshll Jun 5, 2025
25e3248
Add `benchmark` to Gemfile in anticipation of its removal from standa…
moseshll Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ RUN chown app:app /usr/src/app
USER $UNAME
RUN bundle install

CMD ["bundle", "exec", "rackup", "-p", "4567", "-o", "0.0.0.0"]
CMD ["bundle", "exec", "puma", "-p", "4567", "config.ru"]
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source "https://rubygems.org"

gem "benchmark"
gem "canister"
gem "climate_control"
gem "json"
Expand Down
36 changes: 19 additions & 17 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
base64 (0.2.0)
bigdecimal (3.1.9)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.2)
canister (0.9.2)
climate_control (1.2.0)
coderay (1.1.3)
diff-lcs (1.6.1)
diff-lcs (1.6.2)
docile (1.4.1)
json (2.11.3)
language_server-protocol (3.17.0.4)
json (2.12.2)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
method_source (1.1.0)
Expand All @@ -30,12 +31,12 @@ GEM
puma (6.6.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.13)
rack (3.1.16)
rack-protection (4.1.1)
base64 (>= 0.1.0)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-session (2.1.0)
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
Expand All @@ -44,20 +45,20 @@ GEM
rack (>= 3)
rainbow (3.1.1)
regexp_parser (2.10.0)
rspec (3.13.0)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.3)
rspec-core (3.13.4)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.4)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.3)
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.3)
rubocop (1.75.5)
rspec-support (3.13.4)
rubocop (1.75.8)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand All @@ -68,7 +69,7 @@ GEM
rubocop-ast (>= 1.44.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.44.1)
rubocop-ast (1.45.0)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-performance (1.25.0)
Expand All @@ -77,7 +78,7 @@ GEM
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sequel (5.92.0)
sequel (5.93.0)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
Expand All @@ -99,10 +100,10 @@ GEM
rack-protection (= 4.1.1)
sinatra (= 4.1.1)
tilt (~> 2.0)
standard (1.49.0)
standard (1.50.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.75.2)
rubocop (~> 1.75.5)
standard-custom (~> 1.0.0)
standard-performance (~> 1.8)
standard-custom (1.0.2)
Expand All @@ -121,6 +122,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
benchmark
canister
climate_control
json
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
volumes:
- .:/usr/src/app
- gem_cache:/gems
command: bundle exec rackup --host 0.0.0.0 -p 4567
command: bundle exec puma -p 4567 config.ru
environment:
RIGHTS_API_DATABASE_CONNECTION_STRING: "mysql2://ht_rights:ht_rights@mariadb/ht"
RIGHTS_API_LOGGER_LEVEL: 1 # Logger::INFO
Expand Down
2 changes: 2 additions & 0 deletions lib/rights_api/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

module RightsAPI
class App < Sinatra::Base
set :logging, true

# Redirect to the current version
get "/" do
redirect(request.url + "v1/")
Expand Down