Skip to content

Commit

Permalink
Merge pull request #766 from ministryofjustice/revert-761-ft-rails-up…
Browse files Browse the repository at this point in the history
…grade

Revert "updated ruby version on base image"
  • Loading branch information
laurentb4 authored Nov 28, 2024
2 parents c6aef85 + a716479 commit 2ed49c2
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/format-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.6'
ruby-version: '3.2.6'

- name: Format code
env:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.2.6
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3.6-alpine3.19
FROM ruby:3.2.6-alpine3.19

ARG UID=1001
ARG GROUP=app
Expand Down Expand Up @@ -36,7 +36,7 @@ ENV LANG='C.UTF-8' \
CLOUDWATCH_LINK=${CLOUDWATCH_LINK}

RUN apk add --no-cache --virtual .build-deps build-base && \
apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius gcc musl-dev
apk add --no-cache gcompat nodejs yarn mysql-dev mysql-client bash make bind shadow freeradius

RUN if [ "${BUILD_DEV}" = "true" ] ; then \
apk add --no-cache alpine-sdk ruby-dev; \
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ gem "openssl"
gem "puma", "~> 6.4"
gem "rails", "7.2.2"
gem "ransack"
gem "rexml", "3.3.9"
gem "sassc-rails", "~> 2.1.0"
gem "sentry-rails"
gem "sentry-ruby"
gem "sprockets", "~> 4.2.1"
gem "stringio", ">= 3.1.2"
gem "tzinfo-data"

group :development, :test do
Expand Down
Loading

0 comments on commit 2ed49c2

Please sign in to comment.