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
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -72,15 +72,15 @@ 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
- run: bundle exec brakeman -q --no-pager -i brakeman.ignore --except EOLRuby
- 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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.11
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ DEPENDENCIES
webpacker (~> 5.4)

RUBY VERSION
ruby 3.2.0p0
ruby 3.3.11p205

BUNDLED WITH
2.4.6
4 changes: 2 additions & 2 deletions docker/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/workers/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading