diff --git a/.circleci/config.yml b/.circleci/config.yml index 82fdf3ada..adc8121c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ parameters: jobs: login-to-aws: docker: &docker_image - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' steps: - checkout - aws-cli/setup: @@ -36,7 +36,7 @@ jobs: - bash.env build: docker: &docker_image - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' steps: - checkout - ruby/install-deps @@ -62,7 +62,7 @@ jobs: include_job_number_field: false lint: docker: - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' steps: - checkout - ruby/install-deps @@ -72,7 +72,7 @@ jobs: - slack/status: *slack_status security: docker: - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' steps: - checkout - ruby/install-deps @@ -80,7 +80,7 @@ jobs: - slack/status: *slack_status rspec_test: docker: &test_image - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' - environment: POSTGRES_DB: editor_local POSTGRES_PASSWORD: password @@ -115,7 +115,7 @@ jobs: - slack/status: *slack_status js_test: docker: - - image: 'cimg/ruby:3.2.0-node' + - image: 'cimg/ruby:3.3-node' steps: - checkout - run: *node_version diff --git a/.ruby-version b/.ruby-version index 944880fa1..b9b3b0de0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0 +3.3.11 diff --git a/Gemfile b/Gemfile index 637923028..c6215f14f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.2.0' +ruby '3.3.11' # Metadata presenter - if you need to be on development you can uncomment # one of these lines: diff --git a/Gemfile.lock b/Gemfile.lock index 26d25b613..bdc548d4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -895,7 +895,7 @@ DEPENDENCIES webpacker (~> 5.4) RUBY VERSION - ruby 3.2.0p0 + ruby 3.3.11p205 BUNDLED WITH 2.4.6 diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile index aa4e81086..e22a24f2d 100644 --- a/docker/web/Dockerfile +++ b/docker/web/Dockerfile @@ -1,10 +1,10 @@ -FROM ruby:3.2.0-alpine3.16 +FROM ruby:3.3.11-alpine ARG UID=1001 RUN apk update RUN apk add git yarn build-base postgresql-contrib postgresql-dev \ - bash libcurl curl + bash libcurl curl yaml-dev RUN apk add --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/v3.16/main/ nodejs RUN apk add clamav-daemon diff --git a/docker/workers/Dockerfile b/docker/workers/Dockerfile index 9e1f1ffca..f61152213 100644 --- a/docker/workers/Dockerfile +++ b/docker/workers/Dockerfile @@ -1,8 +1,8 @@ -FROM ruby:3.2.0-alpine3.16 +FROM ruby:3.3.11-alpine ARG UID=1001 -RUN apk add git yarn build-base postgresql-contrib postgresql-dev bash libcurl curl +RUN apk add git yarn build-base postgresql-contrib postgresql-dev bash libcurl curl yaml-dev RUN apk add --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/v3.16/main/ nodejs