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
4 changes: 2 additions & 2 deletions .github/workflows/brakeman-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
uses: actions/checkout@v3

# Customize the ruby version depending on your needs
- name: Setup Ruby 3.3.8
- name: Setup Ruby 3.4.5
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.8
ruby-version: 3.4.5

- name: brakeman
uses: reviewdog/action-brakeman@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup Ruby 3.3.8
- name: Setup Ruby 3.4.5
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.8
ruby-version: 3.4.5
- name: Cache gems
uses: actions/cache@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Setup Ruby 3.3.8
- name: Setup Ruby 3.4.5
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.8
ruby-version: 3.4.5

- name: Setup Node 15
uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.8
3.4.5
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# based on Mike Rogers' Dockerfile from:
# - https://github.com/Ruby-Starter-Kits/Docker-Rails-Template/blob/master/Dockerfile
FROM ruby:3.2.3-alpine AS builder
FROM ruby:3.4.5-alpine AS builder
LABEL maintainer="Fabio Lima <fabionl@gmail.com>"

RUN apk --no-cache add --virtual build-dependencies \
Expand All @@ -18,13 +18,15 @@ RUN apk --no-cache add --virtual build-dependencies \
# FFI Bindings in ruby (Run C Commands)
libffi-dev \
# Fixes watch file issues with things like HMR
libnotify-dev
libnotify-dev \
# YAML library for psych gem
yaml-dev

# Dockerize allows us to wait for other containers to be ready before we run our own code.
ENV DOCKERIZE_VERSION v0.6.1
RUN wget -nv https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz

# Rails Specific libraries
RUN apk --no-cache add \
Expand All @@ -50,7 +52,7 @@ RUN apk --no-cache add \
# COPY Aptfile /usr/src/app/Aptfile
# RUN apk add --update $(cat /usr/src/app/Aptfile | xargs)
# Install Bundler v1.3
RUN gem update --system && gem install bundler -v "2.5.6"
RUN gem update --system && gem install bundler -v "2.6.9"

FROM builder AS development

Expand Down
4 changes: 2 additions & 2 deletions 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.3.8"
ruby "3.4.5"

# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "rails", "~> 7.1.0"
Expand Down Expand Up @@ -49,7 +49,7 @@ group :development, :test do
gem "faker", "~> 3.4.2"

# Call "byebug" anywhere in the code to stop execution and get a debugger console
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
gem "byebug", platforms: [:mri, :mingw, :windows]
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ DEPENDENCIES
web-console (~> 4.2.1)

RUBY VERSION
ruby 3.3.8p144
ruby 3.4.5p51

BUNDLED WITH
2.6.9