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
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

9 changes: 8 additions & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ FROM ruby:2.6.6-alpine

# Build ENV vars
ENV APP_PATH /var/app
ENV BUNDLE_VERSION 2.1.4
ENV BUNDLE_VERSION 2.4.12
ENV BUNDLE_PATH /usr/local/bundle/gems
ENV GEM_HOME /usr/local/bundle/gems
ENV TMP_PATH /tmp/
ENV RAILS_LOG_TO_STDOUT true

Expand Down Expand Up @@ -49,12 +50,18 @@ RUN rm -rf /var/cache/apk/* \
RUN gem install bundler --version "$BUNDLE_VERSION" \
&& rm -rf $GEM_HOME/cache/*

RUN gem install rubygems-update -v 3.4.22

RUN gem update --system

# install ember
RUN npm install -g ember-cli

# Change to app dir
WORKDIR $APP_PATH

RUN gem install next_rails

EXPOSE $RAILS_PORT

ENTRYPOINT [ "bundle", "exec" ]
50 changes: 45 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
def next?
File.basename(__FILE__) == "Gemfile.next"
end
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

Expand All @@ -8,7 +11,13 @@ else
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 6.1.5'
if next?
# Do things "the Rails 7.1 way"
gem 'rails', '~> 7.1'
else
# Do things "the Rails 6.1 way"
gem 'rails', '~> 6.1.5'
end
# Use postgresql as the database for Active Record
gem 'pg', '~> 1.1'
# Use Puma as the app server
Expand All @@ -27,7 +36,14 @@ gem 'jbuilder', '~> 2.7'
# Use Active Storage variant
gem 'image_processing', '~> 1.12'

gem 'ros-apartment', require: 'apartment'

if next?
# Do things "the Rails 7.1 way"
gem 'ros-apartment', '3.1.0', require: 'apartment'
else
# Do things "the Rails 6.1 way"
gem 'ros-apartment', '2.9.0', require: 'apartment'
end
gem 'ros-apartment-sidekiq', require: 'apartment-sidekiq'
gem 'apartment-activejob'
gem 'devise'
Expand All @@ -38,7 +54,14 @@ gem 'gravatar_image_tag'
gem 'wicked' # for multi-step forms
gem 'devise_invitable'
gem "aws-sdk-s3", require: false
gem 'meta-tags'
if next?
# Do things "the Rails 7.1 way"
gem 'meta-tags', "2.22.0"
else
# Do things "the Rails 6.1 way"
gem 'meta-tags', "2.14.0"
end

gem 'sitemap_generator'
gem 'ahoy_matey'
gem 'ransack'
Expand Down Expand Up @@ -106,7 +129,15 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "graphql", "~> 2.0"
gem 'graphiql-rails'
gem "ember-cli-rails", "0.10.0"

if next?
# Do things "the Rails 7.1 way"
p 'not loading ember-cli-rails in rails 7'
else
# Do things "the Rails 6.1 way"
gem "ember-cli-rails", "0.10.0"
end

# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 4.1.0'
gem "exception_notification", "~> 4.5"
Expand All @@ -120,11 +151,20 @@ gem "redis-namespace", "~> 1.8"

gem 'stripe-rails'

gem 'devise-two-factor', "4.0.2"

if next?
# Do things "the Rails 7.1 way"
gem 'devise-two-factor', "5.1.0"
else
# Do things "the Rails 6.1 way"
gem 'devise-two-factor', "4.0.2"
end

gem "slowpoke"

gem "strong_migrations"
gem "simple_calendar", "~> 3.0"

gem "icalendar", "~> 2.9"

gem "next_rails", "~> 1.3"
Loading
Loading