diff --git a/.ruby-version b/.ruby-version index 0aec50e6ed..be94e6f53d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.2.2 diff --git a/Dockerfile b/Dockerfile index 696bf969de..ea726373a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/ruby:3.1.4-slim-bookworm@sha256:6c5ebf029d658391fb9243b37e970f84100eab678e2e6e77f316f847e02d5ed9 +FROM public.ecr.aws/docker/library/ruby:3.2.2-slim-bookworm@sha256:17de1131ceb018ab30cbb76505559baa49a4c1b125e03c90dd10220bf863783c ARG RAILS_ENV ARG DD_RUM_VERSION="unknown" @@ -50,12 +50,12 @@ RUN echo "--- :bundler: Installing ruby gems" \ # Install tool for generating static site RUN curl -sf https://gobinaries.com/tj/staticgen/cmd/staticgen | sh -# Add the app -COPY . /app - RUN echo "--- :npm: Installing node dependencies" +COPY package.json yarn.lock ./ RUN yarn +COPY . /app/ + # Compile assets RUN if [ "$RAILS_ENV" = "production" ]; then \ echo "--- Precompiling assets" \ diff --git a/Gemfile.lock b/Gemfile.lock index c7b4577de1..c5a439b522 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM rake (>= 12.2) thor (~> 1.0) rake (13.0.6) - redcarpet (3.5.1) + redcarpet (3.6.0) regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) @@ -152,7 +152,6 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket (1.2.9) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.6.11) @@ -190,7 +189,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.1.4p223 + ruby 3.2.2p53 BUNDLED WITH 2.4.7