1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00

Added files for rvm, removed old files for Heroku newrelic and CircleCI, updated gems, and updated to rubuy 3.2

This commit is contained in:
2024-10-27 16:27:48 -04:00
parent 1f18f338ff
commit b974773289
9 changed files with 67 additions and 165 deletions

View File

@@ -1,43 +0,0 @@
version: 2
workflows: # Define a Workflow running the build job, then the deploy job
version: 2
build-deploy:
jobs:
- build
- deploy:
requires:
- build
filters:
branches:
only: master # Only deploys when the commit is on the Master branch
jobs:
build:
machine: true
steps:
- checkout
- run: |
bash bin/run-tests-with-docker.sh
# https://github.com/circleci/circleci-docs/blob/master/jekyll/_cci1/continuous-deployment-with-heroku.md
deploy:
machine:
image: ubuntu-2004:current
docker_layer_caching: true
steps:
- checkout
- run: |
echo Deploys are happening on my home Jenkins server
echo this is a placeholder in case I want to move that
cat >~/.netrc <<EOF
machine api.heroku.com
login $HEROKU_EMAIL
password $HEROKU_TOKEN
machine git.heroku.com
login $HEROKU_EMAIL
password $HEROKU_TOKEN
EOF
#chmod 600 ~/.netrc # Heroku cli complains about permissions without this
#heroku git:remote -a wrestlingapp
#git push heroku master
#sleep 20s
#heroku run rake db:migrate --app wrestlingapp

1
.ruby-gemset Normal file
View File

@@ -0,0 +1 @@
wrestlingdev

1
.ruby-version Normal file
View File

@@ -0,0 +1 @@
ruby-3.2.0

View File

@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '3.1.4' ruby '3.2.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '7.1.3.2' gem 'rails', '7.1.3.2'
@@ -11,8 +11,8 @@ gem 'rails-html-sanitizer'
gem "sprockets-rails" gem "sprockets-rails"
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
#gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development # can't use 2.0 maybe in a future rails upgrade?
gem 'sqlite3', :group => :development gem 'sqlite3', "~> 1.4", :group => :development
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier' gem 'uglifier'
@@ -49,7 +49,6 @@ gem 'spring', :group => :development
group :production do group :production do
gem 'rails_12factor' gem 'rails_12factor'
gem 'mysql2' gem 'mysql2'
gem 'newrelic_rpm'
gem 'dalli' gem 'dalli'
end end

View File

@@ -78,17 +78,17 @@ GEM
ast (2.4.2) ast (2.4.2)
base64 (0.2.0) base64 (0.2.0)
bcrypt (3.1.20) bcrypt (3.1.20)
bigdecimal (3.1.7) bigdecimal (3.1.8)
brakeman (6.1.2) brakeman (6.2.1)
racc racc
builder (3.2.4) builder (3.3.0)
bullet (7.1.6) bullet (7.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
bundler-audit (0.9.1) bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (~> 1.0) thor (~> 1.0)
cancancan (3.5.0) cancancan (3.6.1)
coffee-rails (5.0.0) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 5.2.0) railties (>= 5.2.0)
@@ -96,15 +96,15 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.2.3) concurrent-ruby (1.3.4)
connection_pool (2.4.1) connection_pool (2.4.1)
crass (1.0.6) crass (1.0.6)
daemons (1.4.1) daemons (1.4.1)
dalli (3.2.8) dalli (3.2.8)
date (3.3.4) date (3.3.4)
delayed_job (4.1.11) delayed_job (4.1.12)
activesupport (>= 3.0, < 8.0) activesupport (>= 3.0, < 8.0)
delayed_job_active_record (4.1.8) delayed_job_active_record (4.1.10)
activerecord (>= 3.0, < 8.0) activerecord (>= 3.0, < 8.0)
delayed_job (>= 3.0, < 5) delayed_job (>= 3.0, < 5)
delayed_job_web (1.4.4) delayed_job_web (1.4.4)
@@ -112,35 +112,35 @@ GEM
delayed_job (> 2.0.3) delayed_job (> 2.0.3)
rack-protection (>= 1.5.5) rack-protection (>= 1.5.5)
sinatra (>= 1.4.4) sinatra (>= 1.4.4)
devise (4.9.3) devise (4.9.4)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
drb (2.2.1) drb (2.2.1)
erubi (1.12.0) erubi (1.13.0)
execjs (2.9.1) execjs (2.9.1)
globalid (1.2.1) globalid (1.2.1)
activesupport (>= 6.1) activesupport (>= 6.1)
i18n (1.14.4) i18n (1.14.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
influxdb (0.8.1) influxdb (0.8.1)
influxdb-rails (1.0.3) influxdb-rails (1.0.3)
influxdb (~> 0.6, >= 0.6.4) influxdb (~> 0.6, >= 0.6.4)
railties (>= 5.0) railties (>= 5.0)
io-console (0.7.2) io-console (0.7.2)
irb (1.12.0) irb (1.14.1)
rdoc rdoc (>= 4.0.0)
reline (>= 0.4.2) reline (>= 0.4.2)
jbuilder (2.11.5) jbuilder (2.13.0)
actionview (>= 5.0.0) actionview (>= 5.0.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
jquery-rails (4.6.0) jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.7.1) json (2.7.2)
language_server-protocol (3.17.0.3) language_server-protocol (3.17.0.3)
loofah (2.22.0) loofah (2.22.0)
crass (~> 1.0.2) crass (~> 1.0.2)
@@ -152,48 +152,48 @@ GEM
net-smtp net-smtp
marcel (1.0.4) marcel (1.0.4)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.22.3) minitest (5.25.1)
mustermann (3.0.0) mustermann (3.0.3)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0) mutex_m (0.2.0)
mysql2 (0.5.6) mysql2 (0.5.6)
net-imap (0.4.10) net-imap (0.4.16)
date date
net-protocol net-protocol
net-pop (0.1.2) net-pop (0.1.2)
net-protocol net-protocol
net-protocol (0.2.2) net-protocol (0.2.2)
timeout timeout
net-smtp (0.4.0.1) net-smtp (0.5.0)
net-protocol net-protocol
newrelic_rpm (9.7.1) nio4r (2.7.3)
nio4r (2.7.1) nokogiri (1.16.7-aarch64-linux)
nokogiri (1.16.3-aarch64-linux)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.3-arm-linux) nokogiri (1.16.7-arm-linux)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.3-arm64-darwin) nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.3-x86-linux) nokogiri (1.16.7-x86-linux)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.3-x86_64-darwin) nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.3-x86_64-linux) nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.24.0) parallel (1.26.3)
parser (3.3.0.5) parser (3.3.5.0)
ast (~> 2.4.1) ast (~> 2.4.1)
racc racc
passenger (6.0.20) passenger (6.0.23)
rack rack (>= 1.6.13)
rake (>= 0.8.1) rackup
rake (>= 12.3.3)
psych (5.1.2) psych (5.1.2)
stringio stringio
puma (6.4.2) puma (6.4.3)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.7.3) racc (1.8.1)
rack (3.0.10) rack (3.1.7)
rack-protection (4.0.0) rack-protection (4.0.0)
base64 (>= 0.1.0) base64 (>= 0.1.0)
rack (>= 3.0.0, < 4) rack (>= 3.0.0, < 4)
@@ -239,31 +239,29 @@ GEM
thor (~> 1.0, >= 1.2.2) thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.1.0) rake (13.2.1)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.6.3.1) rdoc (6.7.0)
psych (>= 4.0.0) psych (>= 4.0.0)
regexp_parser (2.9.0) regexp_parser (2.9.2)
reline (0.4.3) reline (0.5.10)
io-console (~> 0.5) io-console (~> 0.5)
responders (3.1.1) responders (3.1.1)
actionpack (>= 5.2) actionpack (>= 5.2)
railties (>= 5.2) railties (>= 5.2)
rexml (3.2.6)
round_robin_tournament (0.1.2) round_robin_tournament (0.1.2)
rubocop (1.62.1) rubocop (1.66.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.3.0.2) parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.32.2, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2) rubocop-ast (1.32.3)
parser (>= 3.3.0.4) parser (>= 3.3.1.0)
ruby-progressbar (1.13.0) ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
sdoc (2.6.1) sdoc (2.6.1)
@@ -274,13 +272,13 @@ GEM
rack-protection (= 4.0.0) rack-protection (= 4.0.0)
rack-session (>= 2.0.0, < 3) rack-session (>= 2.0.0, < 3)
tilt (~> 2.0) tilt (~> 2.0)
spring (4.1.3) spring (4.2.1)
sprockets (4.2.1) sprockets (4.2.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4) rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2) sprockets-rails (3.5.2)
actionpack (>= 5.2) actionpack (>= 6.1)
activesupport (>= 5.2) activesupport (>= 6.1)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.7.3-aarch64-linux) sqlite3 (1.7.3-aarch64-linux)
sqlite3 (1.7.3-arm-linux) sqlite3 (1.7.3-arm-linux)
@@ -288,28 +286,28 @@ GEM
sqlite3 (1.7.3-x86-linux) sqlite3 (1.7.3-x86-linux)
sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-darwin)
sqlite3 (1.7.3-x86_64-linux) sqlite3 (1.7.3-x86_64-linux)
stringio (3.1.0) stringio (3.1.1)
thor (1.3.1) thor (1.3.2)
tilt (2.3.0) tilt (2.4.0)
timeout (0.4.1) timeout (0.4.1)
turbolinks (5.2.1) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
tzinfo (2.0.6) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2024.1) tzinfo-data (1.2024.2)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.2.0) uglifier (4.2.1)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (2.5.0) unicode-display_width (2.6.0)
uniform_notifier (1.16.0) uniform_notifier (1.16.0)
warden (1.2.9) warden (1.2.9)
rack (>= 2.0.9) rack (>= 2.0.9)
webrick (1.8.1) webrick (1.8.2)
websocket-driver (0.7.6) websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
zeitwerk (2.6.13) zeitwerk (2.6.18)
PLATFORMS PLATFORMS
aarch64-linux aarch64-linux
@@ -334,7 +332,6 @@ DEPENDENCIES
jbuilder jbuilder
jquery-rails jquery-rails
mysql2 mysql2
newrelic_rpm
passenger passenger
puma puma
rails (= 7.1.3.2) rails (= 7.1.3.2)
@@ -346,13 +343,13 @@ DEPENDENCIES
sdoc sdoc
spring spring
sprockets-rails sprockets-rails
sqlite3 sqlite3 (~> 1.4)
turbolinks turbolinks
tzinfo-data tzinfo-data
uglifier uglifier
RUBY VERSION RUBY VERSION
ruby 3.1.4p223 ruby 3.2.0p0
BUNDLED WITH BUNDLED WITH
2.5.6 2.4.1

View File

@@ -1,4 +0,0 @@
worker: bundle exec bin/delayed_job -n 1 run
#worker: bundle exec rake jobs:work
#web: bundle exec puma -w 3 -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
web: bundle exec passenger start -p $PORT --max-pool-size 2 --min-instances 2

View File

@@ -1,49 +0,0 @@
#
# This file configures the New Relic Agent. New Relic monitors Ruby, Java,
# .NET, PHP, Python and Node applications with deep visibility and low
# overhead. For more information, visit www.newrelic.com.
#
# Generated November 04, 2015
#
# This configuration file is custom generated for app42271782@heroku.com_1
#
# For full documentation of agent configuration options, please refer to
# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
common: &default_settings
# Required license key associated with your New Relic account.
license_key: <%= ENV['WRESTLINGDEV_NEW_RELIC_LICENSE_KEY'] %>
# Your application name. Renaming here affects where data displays in New
# Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
app_name: WrestlingDev
# To disable the agent regardless of other settings, uncomment the following:
# agent_enabled: false
# Logging level for log/newrelic_agent.log
log_level: info
# Environment-specific settings are in this section.
# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.
# If your application has other named environments, configure them here.
development:
<<: *default_settings
app_name: My Application (Development)
# NOTE: There is substantial overhead when running in developer mode.
# Do not use for production or load testing.
developer_mode: true
test:
<<: *default_settings
# It doesn't make sense to report to New Relic from automated test runs.
monitor_mode: false
staging:
<<: *default_settings
app_name: My Application (Staging)
production:
<<: *default_settings

View File

@@ -1,4 +1,4 @@
FROM ruby:3.1.4 FROM ruby:3.2.0
RUN apt-get -qq update \ RUN apt-get -qq update \
&& apt-get -qq install -y \ && apt-get -qq install -y \

View File

@@ -1,4 +1,4 @@
FROM ruby:3.1.4-slim FROM ruby:3.2.0-slim
#HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/ #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/