Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eng-487-update dependencies and base images for raat #362

Merged
merged 10 commits into from
Sep 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ on:

jobs:
run-tests:
uses: alphagov/re-request-an-aws-account/.github/workflows/run-tests.yaml@main
uses: ./.github/workflows/run-tests.yaml
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

- name: Set up Ruby
uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442
with:
ruby-version: '3.2'
ruby-version: '3.3.5'

- name: Set up Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.3.5
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# get official nodejs/npm binaries
FROM node:20.11-slim as nodebuilder
FROM node:22.9-slim as nodebuilder
WORKDIR /opt/app
COPY package-lock.json ./
COPY package.json ./
RUN npm i

# bundle install the gems for production
FROM ruby:3.2.3 as rubybuilder
FROM ruby:3.3.5 as rubybuilder
RUN apt update -y \
&& apt -y install nano \
&& cp /usr/bin/nano /usr/local/bin/
Expand All @@ -16,7 +16,7 @@ RUN bundle config set --local without 'development test' \
&& bundle install

# copy required files from base images, precompile assets & cleanup
FROM ruby:3.2.3-slim
FROM ruby:3.3.5-slim
WORKDIR /opt/app
COPY --from=rubybuilder /usr/local/bundle /usr/local/bundle
COPY --from=nodebuilder /usr/local/bin /usr/local/nodebin
Expand Down
3 changes: 2 additions & 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.3'
ruby '~> 3.3.5'

gem 'dotenv-rails', groups: [:development]

Expand All @@ -16,6 +16,7 @@ gem 'sassc-rails'
gem 'webmock', '~> 3.23.0'
gem 'webrick', '~> 1.8.1'
gem 'aws-sdk', '~> 3'
gem 'rexml', '~> 3.3.7'

group :test do
gem 'rack_session_access', '~> 0.2.0'
Expand Down
Loading
Loading