Skip to content

Commit

Permalink
update ruby to 2.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
eitoball committed Dec 10, 2021
1 parent 04c088d commit 945d221
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
13 changes: 8 additions & 5 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:2

RUN /usr/bin/amazon-linux-extras install -y \
postgresql11 \
python3.8 \
ruby2.6
python3.8
RUN /usr/bin/yum install -y \
gcc \
gcc-c++ \
git \
make \
openssl-devel \
postgresql-devel \
rpm-build \
ruby-devel \
rubygem-io-console \
shadow-utils \
sudo \
util-linux \
Expand All @@ -37,7 +35,12 @@ RUN /usr/sbin/adduser -m circleci&& usermod -aG wheel circleci
RUN /usr/bin/sed -i -e "s/^# %wheel/%wheel/" /etc/sudoers

USER circleci
ENV PATH /home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
RUN git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
ENV PATH /home/circleci/.rbenv/bin:/home/circleci/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
RUN eval "$(rbenv init -)"
RUN rbenv install 2.7.4
RUN sudo /usr/bin/pip3.8 install --upgrade pip
RUN sudo /usr/local/bin/pip3.8 install awscli awsebcli

Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: safecast/api-build:2.6.8-amazonlinux2
- image: safecast/api-build:2.7.4-amazonlinux2
environment:
RAILS_ENV: test
AWS_DEFAULT_REGION: us-west-2
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.8
2.7.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6.8
FROM ruby:2.7.4

RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" >> /etc/apt/sources.list.d/pgdg.list
RUN curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.6.8'
ruby '2.7.4'

gem 'rails', '~> 6.0.3.7'

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 2.6.8-p205
ruby 2.7.4-p191

BUNDLED WITH
2.2.29

0 comments on commit 945d221

Please sign in to comment.