Skip to content

Commit

Permalink
updated docker defaults to ensure that local setup still works
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeCodes19 committed May 1, 2024
1 parent 3e2bbb5 commit 6ee08ed
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ group :development, :test do
gem "debug"
# There's some research around running debase within a container with varying architecture
# from the hosts. Especially with M1 > macs. See https://docs.docker.com/build/building/multi-platform/
# gem 'debase-ruby_core_source'
# gem 'debase', '0.2.5.beta2'
# gem 'ruby-debug-ide'
gem "debase"
gem "ruby-debug-ide"
gem "brakeman", "~> 5.2"
gem "bundler-audit", "~> 0.9"
gem "debug", platforms: %i[mri mingw x64_mingw]
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ GEM
cssbundling-rails (1.4.0)
railties (>= 6.0.0)
date (3.3.4)
debase (0.2.5.beta2)
debase-ruby_core_source (>= 0.10.12)
debase-ruby_core_source (3.3.1)
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
Expand Down Expand Up @@ -272,6 +275,8 @@ GEM
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
ruby-debug-ide (0.7.3)
rake (>= 0.8.1)
ruby-graphviz (1.2.5)
rexml
ruby-progressbar (1.13.0)
Expand Down Expand Up @@ -335,6 +340,7 @@ DEPENDENCIES
bundler-audit (~> 0.9)
climate_control (~> 1.0)
cssbundling-rails
debase
debug
dotenv-rails (~> 2.7)
i18n-tasks (~> 1.0)
Expand All @@ -350,6 +356,7 @@ DEPENDENCIES
rubocop
rubocop-rails-omakase
rubocop-rspec
ruby-debug-ide
secure_headers (~> 6.3)
sidekiq (~> 6.4)
sprockets-rails
Expand Down
1 change: 1 addition & 0 deletions config/credentials/development.yml.enc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Btn0OVg1L730VpNEbQ+H15cFKg1y3q/z6IwIaDc9c4iExboCtzTUsYU/NO4sXKVZ0m0ShItWOKR4IxwCqw7GrIRKckilMnNhJKKMZJ9clj6CieYC9efIb8WeUe3c11AA--KLu1KB+ynGorNBrB--+jEPdTuPzExEtrlSeJzR9g==
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ development:
<<: *default
adapter: postgresql
encoding: unicode
database: <%= ENV.fetch("DB_USERNAME") { "iv_cbv_payroll_development" } %>
database: <%= ENV.fetch("DB_NAME") { "iv_cbv_payroll_development" } %>
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

# The specified database role being used to connect to postgres.
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ services:
environment:
- DOCKERIZED=true
- DB_HOST=postgres
- DB_NAME=app_rails
- REDIS_URL=redis://redis:6379/1
- RAILS_BINDING=0.0.0.0
- RAILS_ENV=development
Expand Down

0 comments on commit 6ee08ed

Please sign in to comment.