Skip to content

Commit

Permalink
replace bootstrap gem with vendored theme assets (#332)
Browse files Browse the repository at this point in the history
This removes the need for execjs gem and node and should allow us to
also use the latest alpine version of ruby docker image again.
  • Loading branch information
klausmeyer authored Dec 30, 2023
1 parent 4103044 commit 880c045
Show file tree
Hide file tree
Showing 9 changed files with 11,415 additions and 319 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.2-alpine3.18
FROM ruby:3.2.2-alpine

MAINTAINER Klaus Meyer <[email protected]>

Expand All @@ -20,7 +20,7 @@ WORKDIR /app
ADD . .

RUN apk update \
&& apk add build-base zlib-dev tzdata git nodejs openssl-dev shared-mime-info postgresql-dev libc6-compat \
&& apk add build-base zlib-dev tzdata git openssl-dev shared-mime-info postgresql-dev libc6-compat \
&& rm -rf /var/cache/apk/* \
&& gem install bundler -v $(tail -n1 Gemfile.lock | xargs) \
&& bundle config set build.sassc '--disable-march-tune-native' \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ end
gem "jsonapi-rails", "~> 0.4.0"
gem "doorkeeper", "~> 5.3"
gem "airbrake", "~> 13.0.0"
gem "bootstrap", "~> 4.3"
gem "devise", "~> 4.9"
gem "devise-bootstrap-views", "~> 1.1"
gem "turbolinks", "~> 5.2"
gem "jquery-rails", "~> 4.3"
gem "popper_js", "< 2"
gem "kaminari", "~> 1.1"
gem "tvdb2", github: "pioz/tvdb2", ref: "e720ffb"
gem "health_check", "~> 3.1"
Expand Down
9 changes: 1 addition & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ GEM
airbrake-ruby (~> 6.0)
airbrake-ruby (6.2.2)
rbtree3 (~> 0.6)
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
aws-eventstream (1.3.0)
aws-partitions (1.873.0)
aws-sdk-core (3.190.1)
Expand All @@ -111,10 +109,6 @@ GEM
bigdecimal (3.1.4)
bootsnap (1.17.0)
msgpack (~> 1.2)
bootstrap (4.6.2)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.16.1, < 2)
sassc-rails (>= 2.0.0)
builder (3.2.4)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
Expand All @@ -140,7 +134,6 @@ GEM
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
execjs (2.8.1)
factory_bot (6.4.2)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.2)
Expand Down Expand Up @@ -336,7 +329,6 @@ DEPENDENCIES
airbrake (~> 13.0.0)
aws-sdk-s3
bootsnap
bootstrap (~> 4.3)
debug
devise (~> 4.9)
devise-bootstrap-views (~> 1.1)
Expand All @@ -349,6 +341,7 @@ DEPENDENCIES
jsonapi-rails (~> 0.4.0)
kaminari (~> 1.1)
pg (>= 0.18, < 2.0)
popper_js (< 2)
puma (>= 5.0)
rails (~> 7.1.0)
rspec-rails (~> 6.0)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

//= require jquery3
//= require popper
//= require bootstrap-sprockets
//= require bootstrap

//= require seasons
7 changes: 7 additions & 0 deletions app/assets/javascripts/bootstrap.js

Large diffs are not rendered by default.

Loading

0 comments on commit 880c045

Please sign in to comment.