Skip to content
Open
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: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ jobs:
tags: |
${{ inputs.image_name }}:${{ inputs.image_tag }}
ghcr.io/${{ inputs.image_name }}:${{ inputs.image_tag }}
build-args: |
GIT_TAG=${{ inputs.image_tag }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
20 changes: 19 additions & 1 deletion .github/workflows/parallel_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@ name: Parallel CI
on:
workflow_call:
jobs:
security:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "4.0.1"
bundler-cache: true

- name: Run Brakeman
run: bundle exec brakeman --no-pager

- name: Run Bundler Audit
run: |
bundle exec bundler-audit check --update
parallel-test:
runs-on: ubuntu-latest
strategy:
Expand All @@ -25,7 +43,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.10"
ruby-version: "4.0.1"
bundler-cache: true

- name: Run Specs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.10
ruby-version: 4.0.1
- name: Cache gems
uses: actions/cache@v4
with:
Expand Down
2 changes: 0 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ plugins:
- rubocop-rails
- rubocop-rspec
- rubocop-rspec_rails

require:
- rubocop-factory_bot

AllCops:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.10
ruby-4.0.1
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-ruby32:3.1.6
FROM phusion/passenger-ruby40:3.1.6

# Set correct environment variables.
ENV HOME=/home/app
Expand All @@ -12,7 +12,7 @@ RUN usermod -a -G docker_env app
CMD ["/sbin/my_init"]

# Use Ruby
RUN bash -lc 'rvm --default use ruby-3.2.10'
RUN bash -lc 'rvm --default use ruby-4.0.1'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
Expand Down Expand Up @@ -67,5 +67,8 @@ COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh
# Add the directory to the list of safe directories
RUN git config --global --add safe.directory /home/app/webapp

ARG GIT_TAG=1.0
ENV GIT_TAG=${GIT_TAG}

# Expose web
EXPOSE 80
77 changes: 37 additions & 40 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,51 +1,48 @@
source "https://rubygems.org"

ruby "3.2.10"
ruby "4.0.1"

gem "rails", "~> 7.2", ">= 7.2.3"
gem "bootsnap", require: false
gem "rack-cors"
gem "shoryuken", "~> 7.0"
gem "aws-sdk-sqs", "~> 1.3"
gem "lograge", "~> 0.11.2"
gem "logstash-event", "~> 1.2", ">= 1.2.02"
gem "logstash-logger", "~> 0.26.1"
gem "mysql2", "~> 0.5.3"
gem "dotenv"
gem "sentry-ruby"
gem "sentry-rails"
gem "elasticsearch", "~> 7.17", ">= 7.17.10"
gem "elasticsearch-model", "~> 7.2.1", ">= 7.2.1", require: "elasticsearch/model"
gem "elasticsearch-rails", "~> 7.2.1", ">= 7.2.1"
gem "elasticsearch-transport", "~> 7.17", ">= 7.17.10"
gem "git", "~> 1.5"
gem "faraday", "~> 2.9"
gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
gem "faraday-excon"
gem "rails", "~> 8.1", ">= 8.1.2.1"
gem "addressable", "~> 2.8", ">= 2.8.9"
gem "bootsnap", "~> 1.23", require: false
gem "rack-cors", "~> 3.0"
gem "shoryuken", "~> 7.0", ">= 7.0.1"
gem "aws-sdk-sqs", "~> 1.112"
gem "lograge", "~> 0.14.0"
gem "logstash-logger", "~> 1.0"
gem "mysql2", "~> 0.5.7"
gem "dotenv", "~> 3.2"
gem "sentry-ruby", "~> 6.5"
gem "sentry-rails", "~> 6.5"
gem "elasticsearch", "~> 8.19", ">= 8.19.3"
gem "elasticsearch-model", "~> 8.0", ">= 8.0.1", require: "elasticsearch/model"
gem "elasticsearch-rails", "~> 8.0", ">= 8.0.1"
gem "elastic-transport", "~> 8.0", ">= 8.0.1"
gem "faraday", "~> 2.14", ">= 2.14.1"
gem "faraday_middleware-aws-sigv4", "~> 1.0", ">= 1.0.1"
gem "faraday-excon", "~> 2.4"
gem "uuid", "~> 2.3", ">= 2.3.9"
gem "oj", "~> 3.16", ">= 3.16.11"

# This gem will allow us to write tests without the need for a database
gem "activerecord-nulldb-adapter", "~> 1.1", ">= 1.1.1"
gem "oj", "~> 3.16", ">= 3.16.16"
gem "parallel", "~> 1.27"

group :development, :test do
gem "debug", platforms: [:mri, :windows]
gem "rubocop", require: false
gem "rubocop-shopify", require: false
gem "rubocop-rspec", require: false
gem "rubocop-performance", require: false
gem "rubocop-factory_bot", require: false
gem "rubocop-rails", require: false
gem "rubocop-rspec_rails", require: false
gem "factory_bot_rails"
gem "bundler-audit", require: false
gem "brakeman", require: false
gem "rspec-rails", "~> 7.0.0"
gem "debug", "~> 1.11", ">= 1.11.1", platforms: [:mri, :windows]
gem "rubocop", "~> 1.86", require: false
gem "rubocop-shopify", "~> 2.18", require: false
gem "rubocop-rspec", "~> 3.9", require: false
gem "rubocop-performance", "~> 1.26", ">= 1.26.1", require: false
gem "rubocop-factory_bot", "~> 2.28", require: false
gem "rubocop-rails", "~> 2.34", ">= 2.34.3", require: false
gem "rubocop-rspec_rails", "~> 2.32", require: false
gem "factory_bot_rails", "~> 6.5", ">= 6.5.1"
gem "bundler-audit", "~> 0.9.3", require: false
gem "brakeman", "~> 8.0", ">= 8.0.4", require: false
gem "rspec-rails", "~> 8.0", ">= 8.0.4"
end

group :test do
gem "simplecov", require: false
gem "shoulda-matchers"
gem "coveralls_reborn", require: false
gem "simplecov", "~> 0.22.0", require: false
gem "shoulda-matchers", "~> 7.0", ">= 7.0.1"
gem "coveralls_reborn", "~> 0.29.0", require: false
gem "activerecord-nulldb-adapter", "~> 1.2", ">= 1.2.2" # This gem will allow us to write tests without the need for a database
end
Loading
Loading