Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ log/*.pid
log/*.out
log/*.gz
scripts/.ipynb_checkpoints/*
app/db/test.sqlite3*
9 changes: 6 additions & 3 deletions app/Dockerfile.app
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM ruby:3.2.2-slim-bullseye AS base
ARG TARGET_PLATFORM=linux/amd64
ARG IMAGE_TAG=3.3.7-slim-bullseye

FROM --platform=${TARGET_PLATFORM} ruby:${IMAGE_TAG} AS base

RUN apt-get update -qq \
&& apt-get install -y \
Expand All @@ -23,7 +26,7 @@ COPY Gemfile Gemfile.lock ./
RUN bundle config set --local without 'test' && \
bundle install

FROM base AS final
FROM --platform=$TARGET_PLATFORM base AS final

COPY --from=dependencies /usr/local/bundle /usr/local/bundle

Expand All @@ -33,4 +36,4 @@ COPY . .

EXPOSE 80

CMD ["bundle", "exec", "puma", "-p", "80"]
CMD ["bundle", "exec", "puma", "-p", "80"]
7 changes: 5 additions & 2 deletions app/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM ruby:3.2.2-slim-bullseye
ARG TARGET_PLATFORM=linux/amd64
ARG IMAGE_TAG=3.3.7-slim-bullseye

FROM --platform=${TARGET_PLATFORM} ruby:${IMAGE_TAG}

# Download dependencies for testing
RUN apt-get update -qq \
Expand Down Expand Up @@ -59,4 +62,4 @@ RUN bundle config set --local with 'test' && \

COPY . .

RUN ["rake", "test"]
RUN ["rake", "test"]
4 changes: 2 additions & 2 deletions app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'

ruby '3.2.2'
ruby '3.3.7'

gem 'sinatra'
gem 'puma'

gem 'activerecord'
gem 'activerecord', '7.2.2.1'
gem 'mysql2'
gem 'will_paginate'

Expand Down
139 changes: 90 additions & 49 deletions app/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,105 +1,146 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activerecord (7.1.3.2)
activemodel (= 7.1.3.2)
activesupport (= 7.1.3.2)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activesupport (7.1.3.2)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bigdecimal (3.1.7)
capybara (3.39.2)
benchmark (0.4.0)
bigdecimal (3.1.9)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
date (3.3.4)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
date (3.4.1)
drb (2.2.1)
fakeredis (0.9.2)
redis (~> 4.8)
i18n (1.14.4)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
logger (1.6.6)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
matrix (0.4.2)
mini_mime (1.1.5)
minitest (5.22.3)
mustermann (3.0.0)
minitest (5.25.4)
mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
mysql2 (0.5.5)
net-imap (0.4.8)
mysql2 (0.5.6)
net-imap (0.5.6)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.5.1)
net-protocol
nio4r (2.7.0)
nokogiri (1.16.3-x86_64-linux)
nio4r (2.7.4)
nokogiri (1.18.2-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.2-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.2-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.2-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.2-x86_64-linux-musl)
racc (~> 1.4)
public_suffix (5.0.4)
puma (6.4.0)
public_suffix (6.0.1)
puma (6.6.0)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.9)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
racc (1.8.1)
rack (3.1.10)
rack-protection (4.1.1)
base64 (>= 0.1.0)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
redis (4.8.1)
regexp_parser (2.8.3)
rexml (3.2.6)
regexp_parser (2.10.0)
rexml (3.4.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
selenium-webdriver (4.16.0)
rubyzip (2.4.1)
securerandom (0.4.1)
selenium-webdriver (4.28.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sinatra (3.1.0)
sinatra (4.1.1)
logger (>= 1.6.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.1.0)
rack (>= 3.0.0, < 4)
rack-protection (= 4.1.1)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
sqlite3 (1.6.9-x86_64-linux)
tilt (2.3.0)
timeout (0.4.1)
sqlite3 (2.5.0-aarch64-linux-gnu)
sqlite3 (2.5.0-aarch64-linux-musl)
sqlite3 (2.5.0-arm-linux-gnu)
sqlite3 (2.5.0-arm-linux-musl)
sqlite3 (2.5.0-arm64-darwin)
sqlite3 (2.5.0-x86_64-darwin)
sqlite3 (2.5.0-x86_64-linux-gnu)
sqlite3 (2.5.0-x86_64-linux-musl)
tilt (2.6.0)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
websocket (1.2.10)
will_paginate (4.0.0)
websocket (1.2.11)
will_paginate (4.0.1)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
x86_64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
activerecord
activerecord (= 7.2.2.1)
capybara
fakeredis
mail
Expand All @@ -115,7 +156,7 @@ DEPENDENCIES
will_paginate

RUBY VERSION
ruby 3.2.2p53
ruby 3.3.7p123

BUNDLED WITH
2.4.10
2.6.3
Loading