diff --git a/Gemfile b/Gemfile index 592c2fd3..0a30ff39 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,7 @@ gem 'activerecord-postgis-adapter', github: 'StoneGod/activerecord-postgis-adapt gem 'puma' gem 'pundit' gem 'rails', '~> 8.0' +gem 'racc', '~> 1.8', '>= 1.8.1' # Nokogiri dependency gem 'rgeo' gem 'rswag-api' gem 'rswag-ui' diff --git a/Gemfile.lock b/Gemfile.lock index 8407dd3a..144f3b3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -482,6 +482,7 @@ DEPENDENCIES pry-rails puma pundit + racc (~> 1.8, >= 1.8.1) rails (~> 8.0) redis rgeo diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 37b04015..ba6a21fe 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-alpine +FROM ruby:3.3.4-slim ENV APP_PATH=/var/app ENV BUNDLE_VERSION=2.5.21 @@ -6,22 +6,27 @@ ENV BUNDLE_PATH=/usr/local/bundle/gems ENV RAILS_LOG_TO_STDOUT=true ENV RAILS_PORT=3000 ENV RAILS_ENV=development +ENV BUNDLE_FORCE_RUBY_PLATFORM=1 +ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1 # Install dependencies for application -RUN apk -U add --no-cache \ - build-base \ +RUN apt-get update -qq && apt-get install -y \ + build-essential \ git \ - postgresql-dev \ + libpq-dev \ postgresql-client \ + libxml2 \ libxml2-dev \ - libxslt-dev \ + libxslt1-dev \ nodejs \ - yarn \ + npm \ imagemagick \ tzdata \ less \ - yaml-dev \ - gcompat \ + libyaml-dev \ + pkg-config \ + && npm install -g yarn \ + && rm -rf /var/lib/apt/lists/* \ && mkdir -p $APP_PATH # Update gem system and install bundler @@ -35,7 +40,7 @@ COPY ../Gemfile ../Gemfile.lock ../.ruby-version ../vendor ./ # Install all gems into the image RUN bundle config set --local path 'vendor/bundle' \ - && bundle install --jobs 4 --retry 3 \ + && bundle install --jobs 1 --retry 3 \ && rm -rf vendor/bundle/ruby/3.3.0/cache/*.gem # Copy the rest of the application