diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..9612375 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,37 @@ +# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files. + +# Ignore git directory. +/.git/ + +# Ignore bundler config. +/.bundle + +# Ignore all environment files (except templates). +/.env* +!/.env*.erb + +# Ignore all default key files. +/config/master.key +/config/credentials/*.key + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/.keep + +# Ignore storage (uploaded files in development and any SQLite databases). +/storage/* +!/storage/.keep +/tmp/storage/* +!/tmp/storage/.keep + +# Ignore assets. +/node_modules/ +/app/assets/builds/* +!/app/assets/builds/.keep +/public/assets diff --git a/.github/workflows/_codeql.yml b/.github/workflows/_codeql.yml new file mode 100644 index 0000000..b168566 --- /dev/null +++ b/.github/workflows/_codeql.yml @@ -0,0 +1,31 @@ +name: CodeQL + +on: + workflow_call: + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + runs-on: "ubuntu-latest" + permissions: + security-events: write + strategy: + fail-fast: false + matrix: + include: + - language: ruby + build-mode: none + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml new file mode 100644 index 0000000..01eda31 --- /dev/null +++ b/.github/workflows/_docker.yml @@ -0,0 +1,45 @@ +name: Build + +on: + workflow_call: + inputs: + tag-name: + type: string + required: false + default: "gmmcal/ynab" + target: + type: string + required: false + default: test + publish: + type: boolean + required: false + default: true + +jobs: + build: + name: "Build Image" + runs-on: ubuntu-20.04 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build image + uses: docker/build-push-action@v5 + with: + push: ${{ inputs.publish }} + context: . + target: ${{ inputs.target }} + tags: ${{ inputs.tag-name }}:${{ inputs.target }} + cache-from: type=registry,ref=gmmcal/ynab:buildcache${{ inputs.target }} + cache-to: type=registry,ref=gmmcal/ynab:buildcache${{ inputs.target }},mode=max diff --git a/.github/workflows/_lint.yml b/.github/workflows/_lint.yml new file mode 100644 index 0000000..aab157d --- /dev/null +++ b/.github/workflows/_lint.yml @@ -0,0 +1,25 @@ +name: Lint + +on: + workflow_call: + inputs: + command: + type: string + required: true + image: + type: string + required: false + default: gmmcal/ynab:test + +jobs: + lint: + name: Lint + runs-on: ubuntu-20.04 + container: + image: ${{ inputs.image }} + options: "--user=root:root" + + steps: + - name: Execute ${{ inputs.command }} + run: ${{ inputs.command }} + working-directory: /rails diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml new file mode 100644 index 0000000..a959554 --- /dev/null +++ b/.github/workflows/_release.yml @@ -0,0 +1,29 @@ +name: Release + +on: + workflow_call: + inputs: + tag: + type: string + required: true + +jobs: + release: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Create release + uses: ncipollo/release-action@v1 + with: + generateReleaseNotes: true + tag: ${{ inputs.tag }} + + deploy: + name: Deploy + uses: ./.github/workflows/deploy.yml + secrets: inherit + needs: release diff --git a/.github/workflows/_tests.yml b/.github/workflows/_tests.yml new file mode 100644 index 0000000..81295e1 --- /dev/null +++ b/.github/workflows/_tests.yml @@ -0,0 +1,38 @@ +name: Backend Tests + +on: + workflow_call: + inputs: + command: + type: string + required: true + +jobs: + tests: + name: Tests + runs-on: ubuntu-20.04 + container: + image: gmmcal/ynab:test + env: + DATABASE_URL: postgres://postgres:postgres@postgres:5432/gmmcalcombr_test + DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true + + services: + postgres: + image: postgres:16 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: gmmcalcombr_test + ports: + - 5432:5432 + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + + steps: + - name: Migrate database + run: bundle exec rails db:migrate + working-directory: /rails + + - name: Execute tests + run: ${{ inputs.command }} + working-directory: /rails diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..577a798 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,25 @@ +name: Deploy + +on: + push: + branches: + - main + release: + types: [published] + workflow_call: + +jobs: + build_production: + name: "Build: Production" + uses: ./.github/workflows/_docker.yml + secrets: inherit + with: + target: production + + build_development: + name: "Build: Development" + uses: ./.github/workflows/_docker.yml + secrets: inherit + with: + target: development + if: github.event_name == 'push' diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..ba932ab --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,65 @@ +name: Pipeline + +on: + - pull_request + +jobs: + build: + name: Test + uses: ./.github/workflows/_docker.yml + secrets: inherit + + development: + name: Development + uses: ./.github/workflows/_docker.yml + secrets: inherit + with: + target: development + publish: false + + production: + name: Production + uses: ./.github/workflows/_docker.yml + secrets: inherit + with: + target: production + publish: false + + rubocop: + name: Rubocop + uses: ./.github/workflows/_lint.yml + with: + command: bundle exec rubocop --config .rubocop.yml . + needs: build + + reek: + name: Reek + uses: ./.github/workflows/_lint.yml + with: + command: bundle exec reek --config .reek.yml . + needs: build + + brakeman: + name: Brakeman + uses: ./.github/workflows/_lint.yml + with: + command: bundle exec brakeman + needs: build + + tests: + name: Backend + uses: ./.github/workflows/_tests.yml + with: + command: bundle exec rails test + needs: build + + bundler-audit: + name: Bundler Audit + uses: ./.github/workflows/_lint.yml + with: + command: bundle exec bundle-audit check --update + needs: build + + codeql: + name: Bundler Audit + uses: ./.github/workflows/_codeql.yml diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml new file mode 100644 index 0000000..14bc0a6 --- /dev/null +++ b/.github/workflows/tag.yml @@ -0,0 +1,67 @@ +name: Tag + +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + determine-tag: + name: Determine version number + runs-on: ubuntu-20.04 + outputs: + version: ${{ steps.tag.outputs.version }} + has-changes: ${{ steps.diff.outputs.has_changes }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-tags: true + fetch-depth: 0 + + - name: Get diff + id: diff + run: | + LATEST=`git describe --tags --abbrev=0` + DIFF=`git diff --name-only $LATEST $GITHUB_SHA | awk '{printf "%s+",$0} END {print ""}'` + if [ "$DIFF" != '' ]; then + echo "has_changes=true" >> "$GITHUB_OUTPUT" + else + echo "has_changes=false" >> $GITHUB_OUTPUT; + fi + + - name: Bump tag number + id: tag + run: | + VERSION=`git describe --tags --abbrev=0 | awk -F. '{OFS="."; $NF+=1; print $0}'` + echo "version=$VERSION" >> "$GITHUB_OUTPUT" + + - name: Print version + run: echo ${{ steps.tag.outputs.version }} + + create-tag: + name: Create tag + runs-on: ubuntu-20.04 + needs: determine-tag + if: needs.determine-tag.outputs.has-changes == 'true' + + steps: + - name: Create Tag ${{needs.determine-tag.outputs.version}} + uses: actions/github-script@v6 + with: + script: | + github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/tags/${{needs.determine-tag.outputs.version}}', + sha: context.sha + }) + + create-release: + name: Release + uses: ./.github/workflows/_release.yml + secrets: inherit + needs: [create-tag, determine-tag] + with: + tag: ${{needs.determine-tag.outputs.version}} diff --git a/.reek.yml b/.reek.yml index a476e0e..2f4bf3d 100644 --- a/.reek.yml +++ b/.reek.yml @@ -10,6 +10,8 @@ detectors: InstanceVariableAssumption: exclude: - "/Controller$/" + TooManyInstanceVariables: + max_instance_variables: 5 directories: "db/migrate": @@ -17,5 +19,4 @@ directories: enabled: false exclude_paths: - - node_modules - vendor diff --git a/.rubocop.yml b/.rubocop.yml index 961509a..cc79a4a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,14 +3,11 @@ require: - rubocop-rails AllCops: - TargetRubyVersion: 3.0 + TargetRubyVersion: 3.2 DisplayCopNames: true NewCops: enable Exclude: - - 'bin/**/*' - - 'db/schema.rb' - - 'node_modules/**/*' - - 'vendor/**/*' + - "vendor/**/*" Rails: Enabled: true @@ -20,3 +17,28 @@ Style/Documentation: Style/TrailingCommaInHashLiteral: EnforcedStyleForMultiline: consistent_comma + +# rails default files things +Layout/LineLength: + Exclude: + - bin/bundle + +Metrics/BlockLength: + Exclude: + - config/environments/development.rb + +Metrics/CyclomaticComplexity: + Exclude: + - bin/bundle + +Metrics/MethodLength: + Exclude: + - bin/bundle + +Metrics/PerceivedComplexity: + Exclude: + - bin/bundle + +Rails/SkipsModelValidations: + Exclude: + - db/migrate/20240401075141_add_service_name_to_active_storage_blobs.active_storage.rb diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f15fc65 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,135 @@ +# syntax = docker/dockerfile:1 + +# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile +ARG RUBY_VERSION=3.2.2 +FROM ruby:$RUBY_VERSION-slim as base + +# Rails app lives here +WORKDIR /rails + +ENV BUNDLE_PATH="/usr/local/bundle" + +# Update gems and bundler +RUN gem update --system --no-document && \ + gem install -N bundler + + +# Throw-away build stage to reduce size of final image +FROM base as build + +# Install packages needed to build gems +RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ + --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ + apt-get update -qq && \ + apt-get install --no-install-recommends -y build-essential libpq-dev curl + +# Install application gems +COPY Gemfile Gemfile.lock ./ +RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \ + bundle config set app_config .bundle && \ + bundle config set path /srv/vendor && \ + bundle install && \ + bundle exec bootsnap precompile --gemfile && \ + bundle clean && \ + mkdir -p vendor && \ + bundle config set path vendor && \ + cp -ar /srv/vendor . + +# Copy application code +COPY . . + +# Precompile bootsnap code for faster boot times +RUN bundle exec bootsnap precompile app/ lib/ + +# Precompiling assets for production without requiring secret RAILS_MASTER_KEY +RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile + + +# Final stage for app image +FROM base as production + +# Set production environment +ENV BUNDLE_DEPLOYMENT="1" \ + BUNDLE_WITHOUT="development" \ + RAILS_ENV="production" + +# Install packages needed for deployment +RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ + --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ + apt-get update -qq && \ + apt-get install --no-install-recommends -y curl libjemalloc2 postgresql-client + +# Copy built artifacts: gems, application +COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}" +COPY --from=build /rails /rails + +# Run and own only the runtime files as a non-root user for security +RUN groupadd --system --gid 1000 rails && \ + useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \ + chown -R 1000:1000 db log storage tmp +USER 1000:1000 + +# Deployment options +ENV LD_PRELOAD="libjemalloc.so.2" \ + MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true" \ + RUBY_YJIT_ENABLE="1" + +# Entrypoint prepares the database. +ENTRYPOINT ["/rails/bin/docker-entrypoint"] + +# Start the server by default, this can be overwritten at runtime +EXPOSE 3000 +CMD ["./bin/rails", "server"] + +FROM base as development + +# Set production environment +ENV RAILS_ENV="development" + +# Install packages needed for deployment +RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ + --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ + apt-get update -qq && \ + apt-get install --no-install-recommends -y curl libjemalloc2 postgresql-client + +# Copy built artifacts: gems, application +COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}" +COPY --from=build /rails /rails + +# Run and own only the runtime files as a non-root user for security +RUN groupadd --system --gid 1000 rails && \ + useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \ + chown -R 1000:1000 db log storage tmp +USER 1000:1000 + +# Entrypoint prepares the database. +ENTRYPOINT ["/rails/bin/docker-entrypoint"] + +# Start the server by default, this can be overwritten at runtime +EXPOSE 3000 +CMD ["./bin/rails", "server"] + +FROM base as test + +ENV RAILS_ENV="test" + +# Install packages needed for deployment +RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ + --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ + apt-get update -qq && \ + apt-get install --no-install-recommends -y curl libjemalloc2 postgresql-client git + +# Copy built artifacts: gems, application +COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}" +COPY --from=build /rails /rails + +# Run and own only the runtime files as a non-root user for security +RUN groupadd --system --gid 1000 rails && \ + useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \ + chown -R 1000:1000 db log storage tmp +USER 1000:1000 + +# Entrypoint prepares the database. +ENTRYPOINT ["/rails/bin/docker-entrypoint"] + +CMD ["./bin/rails", "test"] diff --git a/Gemfile b/Gemfile index 472d0bf..663b42b 100644 --- a/Gemfile +++ b/Gemfile @@ -60,6 +60,7 @@ end group :development do gem 'brakeman' + gem 'bundler-audit' gem 'reek' gem 'rubocop' gem 'rubocop-capybara' diff --git a/Gemfile.lock b/Gemfile.lock index f7c8c55..eac9fe4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,6 +86,9 @@ GEM brakeman (6.1.2) racc builder (3.2.4) + bundler-audit (0.9.1) + bundler (>= 1.2.0, < 3) + thor (~> 1.0) capybara (3.40.0) addressable matrix @@ -102,6 +105,8 @@ GEM debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) + dockerfile-rails (1.6.7) + rails (>= 3.0.0) drb (2.2.1) dry-configurable (1.1.0) dry-core (~> 1.0, < 2) @@ -175,6 +180,8 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.0) + nokogiri (1.16.2-aarch64-linux) + racc (~> 1.4) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) @@ -309,14 +316,17 @@ GEM zeitwerk (2.6.13) PLATFORMS + aarch64-linux arm64-darwin-23 x86_64-linux DEPENDENCIES bootsnap brakeman + bundler-audit capybara debug + dockerfile-rails (>= 1.6) importmap-rails jbuilder pg (~> 1.5) diff --git a/app/controllers/report_controller.rb b/app/controllers/report_controller.rb index 4e6ff07..33e8db8 100644 --- a/app/controllers/report_controller.rb +++ b/app/controllers/report_controller.rb @@ -9,7 +9,7 @@ def all @dates = reports.pluck(:date).uniq.sort @values = reports.group_by(&:name).map do |name, value| { - name: name, + name:, data: extract_data(value), marker: { symbol: 'circle' }, } @@ -21,7 +21,7 @@ def yearly @dates = reports.pluck(:date).uniq.sort @values = reports.group_by(&:name).map do |name, value| { - name: name, + name:, data: extract_data(value), marker: { symbol: 'circle' }, } @@ -41,10 +41,14 @@ def category def extract_data(values) values.group_by(&:date).map do |key, value| - [key.to_s, value.inject(0.0) { |sum, item| sum + item.activity.to_f }] + [key.to_s, total(value)] end end + def total(value) + value.inject(0.0) { |sum, item| sum + item.activity.to_f } + end + def date return "#{params[:year]}-01-01".to_date if params[:year] diff --git a/app/lib/importer.rb b/app/lib/importer.rb index 9fd4570..a7c580d 100644 --- a/app/lib/importer.rb +++ b/app/lib/importer.rb @@ -8,13 +8,8 @@ def initialize(token) end def process - ActiveRecord::Base.transaction do - process_months - end + ActiveRecord::Base.transaction { process_months } Rails.logger.info { 'Data successfully imported' } - rescue StandardError => e - Rails.logger.info { "ERROR: id=#{e.id}; name=#{e.name}; detail: #{e.detail}" } - nil end private @@ -33,7 +28,7 @@ def categories(month) end def parent(name) - Category.find_or_create_by(name: name) + Category.find_or_create_by(name:) end def update_category(category, note, visible) diff --git a/bin/bundle b/bin/bundle index 8012441..11ca0c4 100755 --- a/bin/bundle +++ b/bin/bundle @@ -18,7 +18,7 @@ m = Module.new do end def env_var_version - ENV['BUNDLER_VERSION'] + ENV.fetch('BUNDLER_VERSION', nil) end def cli_arg_version @@ -38,8 +38,8 @@ m = Module.new do end def gemfile - gemfile = ENV['BUNDLE_GEMFILE'] - return gemfile if gemfile && !gemfile.empty? + gemfile = ENV.fetch('BUNDLE_GEMFILE', nil) + return gemfile if gemfile.present? File.expand_path('../Gemfile', __dir__) end diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint new file mode 100755 index 0000000..67ef493 --- /dev/null +++ b/bin/docker-entrypoint @@ -0,0 +1,8 @@ +#!/bin/bash -e + +# If running the rails server then create or migrate existing database +if [ "${1}" == "./bin/rails" ] && [ "${2}" == "server" ]; then + ./bin/rails db:prepare +fi + +exec "${@}" diff --git a/bin/setup b/bin/setup index 516b651..016b7e2 100755 --- a/bin/setup +++ b/bin/setup @@ -6,8 +6,8 @@ require 'fileutils' # path to your application root. APP_ROOT = File.expand_path('..', __dir__) -def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") +def system!(*) + system(*, exception: true) end FileUtils.chdir APP_ROOT do diff --git a/config/application.rb b/config/application.rb index 9ff6286..f67746e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -11,7 +11,12 @@ module Ynab class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults 7.1 + + # Please, add to the `ignore` list any other `lib` subdirectories that do + # not contain `.rb` files, or that should not be reloaded or eager loaded. + # Common ones are `templates`, `generators`, or `middleware`, for example. + config.autoload_lib(ignore: %w[assets tasks]) # Configuration for the application, engines, and railties goes here. # diff --git a/config/database.yml b/config/database.yml index 45412f5..fb9bb1a 100644 --- a/config/database.yml +++ b/config/database.yml @@ -17,6 +17,9 @@ default: &default adapter: postgresql encoding: unicode + host: <%= ENV.fetch("DATABASE_HOST") { 'localhost' } %> + username: <%= ENV.fetch("DATABASE_USERNAME") { 'postgres' } %> + password: <%= ENV.fetch("DATABASE_PASSWORD") { 'postgres' } %> # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> @@ -80,4 +83,5 @@ test: # for a full overview on how database connection configuration can be specified. # production: + adapter: postgresql url: <%= ENV['DATABASE_URL'] %> diff --git a/config/dockerfile.yml b/config/dockerfile.yml new file mode 100644 index 0000000..3c9a2f8 --- /dev/null +++ b/config/dockerfile.yml @@ -0,0 +1,11 @@ +# generated by dockerfile-rails + +--- +options: + cache: true + ci: true + jemalloc: true + label: + fly_launch_runtime: rails + swap: '100' + yjit: true diff --git a/config/environments/development.rb b/config/environments/development.rb index db010bd..8198fdb 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -8,7 +8,7 @@ # In the development environment your application's code is reloaded any time # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - config.cache_classes = false + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false @@ -58,6 +58,9 @@ # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true + # Highlight code that enqueued background job in logs. + config.active_job.verbose_enqueue_logs = true + # Suppress logger output for asset requests. config.assets.quiet = true @@ -69,4 +72,7 @@ # Uncomment if you wish to allow Action Cable access from any origin. # config.action_cable.disable_request_forgery_protection = true + + # Raise error when a before_action's only/except options reference missing actions + config.action_controller.raise_on_missing_callback_actions = true end diff --git a/config/environments/production.rb b/config/environments/production.rb index 0b3d5fc..dd1ae37 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -6,7 +6,7 @@ # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. - config.cache_classes = true + config.enable_reloading = false # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers @@ -15,21 +15,20 @@ config.eager_load = true # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false + config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment + # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files). # config.require_master_key = true - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead. + # config.public_file_server.enabled = false # Compress CSS using a preprocessor. # config.assets.css_compressor = :sass - # Do not fallback to assets pipeline if a precompiled asset is missed. + # Do not fall back to assets pipeline if a precompiled asset is missed. config.assets.compile = false # Enable serving of images, stylesheets, and JavaScripts from an asset server. @@ -47,21 +46,31 @@ # config.action_cable.url = "wss://example.com/cable" # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ] + # Assume all access to the app is happening through a SSL-terminating reverse proxy. + # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies. + # config.assume_ssl = true + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true + config.force_ssl = true - # Include generic and useful information about system operation, but avoid logging too much - # information to avoid inadvertent exposure of personally identifiable information (PII). - config.log_level = :info + # Log to STDOUT by default + config.logger = ActiveSupport::Logger.new($stdout) + .tap { |logger| logger.formatter = Logger::Formatter.new } + .then { |logger| ActiveSupport::TaggedLogging.new(logger) } # Prepend all log lines with the following tags. config.log_tags = [:request_id] + # "info" includes generic and useful information about system operation, but avoids logging too much + # information to avoid inadvertent exposure of personally identifiable information (PII). If you + # want to log everything, set the level to "debug". + config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'info') + # Use a different cache store in production. # config.cache_store = :mem_cache_store # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque + # config.active_job.queue_adapter = :resque # config.active_job.queue_name_prefix = "ynab_production" config.action_mailer.perform_caching = false @@ -77,19 +86,18 @@ # Don't log any deprecations. config.active_support.report_deprecations = false - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = Logger::Formatter.new - - # Use a different logger for distributed setups. - # require "syslog/logger" - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") - - if ENV['RAILS_LOG_TO_STDOUT'].present? - logger = ActiveSupport::Logger.new($stdout) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + + # Enable DNS rebinding protection and other `Host` header attacks. + # config.hosts = [ + # "example.com", # Allow requests from example.com + # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com` + # ] + # Skip DNS rebinding protection for the default health check endpoint. + # config.host_authorization = { exclude: ->(request) { request.path == "/up" } } +end + +Rails.application.configure do + config.require_master_key = false end diff --git a/config/environments/test.rb b/config/environments/test.rb index 02ea987..983be8e 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -10,12 +10,13 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Turn false under Spring and add config.action_view.cache_template_loading = true. - config.cache_classes = true + # While tests run files are not watched, reloading is not necessary. + config.enable_reloading = false - # Eager loading loads your whole application. When running a single test locally, - # this probably isn't necessary. It's a good idea to do in a continuous integration - # system, or in some way before deploying your code. + # Eager loading loads your entire application. When running a single test locally, + # this is usually not necessary, and can slow down your test suite. However, it's + # recommended that you enable it in continuous integration systems to ensure eager + # loading is working properly before deploying your code. config.eager_load = ENV['CI'].present? # Configure public file server for tests with Cache-Control for performance. @@ -25,12 +26,12 @@ } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false config.cache_store = :null_store - # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + # Render exception templates for rescuable exceptions and raise for other exceptions. + config.action_dispatch.show_exceptions = :rescuable # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false @@ -59,4 +60,7 @@ # Annotate rendered view with file names. # config.action_view.annotate_rendered_view_with_filenames = true + + # Raise error when a before_action's only/except options reference missing actions + config.action_controller.raise_on_missing_callback_actions = true end diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 691cfa1..35ab3fd 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Define an application-wide content security policy. @@ -17,9 +18,9 @@ # # policy.report_uri "/csp-violation-report-endpoint" # end # -# # Generate session nonces for permitted importmap and inline scripts +# # Generate session nonces for permitted importmap, inline scripts, and inline styles. # config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src) +# config.content_security_policy_nonce_directives = %w(script-src style-src) # # # Report violations without enforcing the policy. # # config.content_security_policy_report_only = true diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index 3df77c5..c416e6a 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -2,9 +2,9 @@ # Be sure to restart your server when you modify this file. -# Configure parameters to be filtered from the log file. Use this to limit dissemination of -# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported -# notations and behaviors. +# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file. +# Use this to limit dissemination of sensitive information. +# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. Rails.application.config.filter_parameters += %i[ passw secret token _key crypt salt certificate otp ssn ] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 6c78420..9e049dc 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Add new inflection rules using the following format. Inflections diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb new file mode 100644 index 0000000..ebedc26 --- /dev/null +++ b/config/initializers/new_framework_defaults_7_1.rb @@ -0,0 +1,282 @@ +# frozen_string_literal: true + +# Be sure to restart your server when you modify this file. +# +# This file eases your Rails 7.1 framework defaults upgrade. +# +# Uncomment each configuration one by one to switch to the new default. +# Once your application is ready to run with all new defaults, you can remove +# this file and set the `config.load_defaults` to `7.1`. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. +# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html + +### +# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able +# to manually require files that are managed by the autoloader, which you shouldn't do anyway. +# +# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size +# of the bootsnap cache if you use it. +# +# To set this configuration, add the following line to `config/application.rb` (NOT this file): +# config.add_autoload_paths_to_load_path = false + +### +# Remove the default X-Download-Options headers since it is used only by Internet Explorer. +# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`. +#++ +# Rails.application.config.action_dispatch.default_headers = { +# "X-Frame-Options" => "SAMEORIGIN", +# "X-XSS-Protection" => "0", +# "X-Content-Type-Options" => "nosniff", +# "X-Permitted-Cross-Domain-Policies" => "none", +# "Referrer-Policy" => "strict-origin-when-cross-origin" +# } + +### +# Do not treat an `ActionController::Parameters` instance +# as equal to an equivalent `Hash` by default. +#++ +# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false + +### +# Active Record Encryption now uses SHA-256 as its hash digest algorithm. +# +# There are 3 scenarios to consider. +# +# 1. If you have data encrypted with previous Rails versions, and you have +# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default +# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1 +# +# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default +# in 7.0), then you need to configure SHA-256 for Active Record Encryption: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256 +# +# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to +# configure the default behavior starting 7.1+: +#++ +# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false + +### +# No longer run after_commit callbacks on the first of multiple Active Record +# instances to save changes to the same database row within a transaction. +# Instead, run these callbacks on the instance most likely to have internal +# state which matches what was committed to the database, typically the last +# instance to save. +#++ +# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false + +### +# Configures SQLite with a strict strings mode, which disables double-quoted string literals. +# +# SQLite has some quirks around double-quoted string literals. +# It first tries to consider double-quoted strings as identifier names, but if they don't exist +# it then considers them as string literals. Because of this, typos can silently go unnoticed. +# For example, it is possible to create an index for a non existing column. +# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details. +#++ +# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true + +### +# Disable deprecated singular associations names. +#++ +# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false + +### +# Enable the Active Job `BigDecimal` argument serializer, which guarantees +# roundtripping. Without this serializer, some queue adapters may serialize +# `BigDecimal` arguments as simple (non-roundtrippable) strings. +# +# When deploying an application with multiple replicas, old (pre-Rails 7.1) +# replicas will not be able to deserialize `BigDecimal` arguments from this +# serializer. Therefore, this setting should only be enabled after all replicas +# have been successfully upgraded to Rails 7.1. +#++ +# Rails.application.config.active_job.use_big_decimal_serializer = true + +### +# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or +# `write` are given an invalid `expires_at` or `expires_in` time. +# Options are `true`, and `false`. If `false`, the exception will be reported +# as `handled` and logged instead. +#++ +# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true + +### +# Specify whether Query Logs will format tags using the SQLCommenter format +# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format. +# Options are `:legacy` and `:sqlcommenter`. +#++ +# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter + +### +# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier` +# instances. +# +# The legacy default is `:marshal`, which is a potential vector for +# deserialization attacks in cases where a message signing secret has been +# leaked. +# +# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and +# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing +# with `Marshal` so that legacy messages can still be read. +# +# In Rails 7.2, the default will become `:json` which serializes and +# deserializes with `ActiveSupport::JSON` only. +# +# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`, +# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack` +# can roundtrip some Ruby types that are not supported by JSON, and may provide +# improved performance, but it requires the `msgpack` gem. +# +# For more information, see +# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer +# +# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers +# that have not yet been upgraded must be able to read messages from upgraded +# servers, first deploy without changing the serializer, then set the serializer +# in a subsequent deploy. +#++ +# Rails.application.config.active_support.message_serializer = :json_allow_marshal + +### +# Enable a performance optimization that serializes message data and metadata +# together. This changes the message format, so messages serialized this way +# cannot be read by older versions of Rails. However, messages that use the old +# format can still be read, regardless of whether this optimization is enabled. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read messages from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_support.use_message_serializer_for_metadata = true + +### +# Set the maximum size for Rails log files. +# +# `config.load_defaults 7.1` does not set this value for environments other than +# development and test. +#++ +# if Rails.env.local? +# Rails.application.config.log_file_size = 100 * 1024 * 1024 +# end + +### +# Enable raising on assignment to attr_readonly attributes. The previous +# behavior would allow assignment but silently not persist changes to the +# database. +#++ +# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true + +### +# Enable validating only parent-related columns for presence when the parent is mandatory. +# The previous behavior was to validate the presence of the parent record, which performed an extra query +# to get the parent every time the child record was updated, even when parent has not changed. +#++ +# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false + +### +# Enable precompilation of `config.filter_parameters`. Precompilation can +# improve filtering performance, depending on the quantity and types of filters. +#++ +# Rails.application.config.precompile_filter_parameters = true + +### +# Enable before_committed! callbacks on all enrolled records in a transaction. +# The previous behavior was to only run the callbacks on the first copy of a record +# if there were multiple copies of the same record enrolled in the transaction. +#++ +# Rails.application.config.active_record.before_committed_on_all_records = true + +### +# Disable automatic column serialization into YAML. +# To keep the historic behavior, you can set it to `YAML`, however it is +# recommended to explicitly define the serialization method for each column +# rather than to rely on a global default. +#++ +# Rails.application.config.active_record.default_column_serializer = nil + +### +# Enable a performance optimization that serializes Active Record models +# in a faster and more compact way. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read caches from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_record.marshalling_format_version = 7.1 + +### +# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model. +# This matches the behaviour of all other callbacks. +# In previous versions of Rails, they ran in the inverse order. +#++ +# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true + +### +# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`. +#++ +# Rails.application.config.active_record.commit_transaction_on_non_local_return = true + +### +# Controls when to generate a value for has_secure_token declarations. +#++ +# Rails.application.config.active_record.generate_secure_token_on = :initialize + +### +# ** Please read carefully, this must be configured in config/application.rb ** +# +# Change the format of the cache entry. +# +# Changing this default means that all new cache entries added to the cache +# will have a different format that is not supported by Rails 7.0 +# applications. +# +# Only change this value after your application is fully deployed to Rails 7.1 +# and you have no plans to rollback. +# When you're ready to change format, add this to `config/application.rb` (NOT +# this file): +# config.active_support.cache_format_version = 7.1 + +### +# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure the log level used by the DebugExceptions middleware when logging +# uncaught exceptions during requests. +#++ +# Rails.application.config.action_dispatch.debug_exception_log_level = :error + +### +# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5 +# parsers. +# +# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4. +# +# In previous versions of Rails, these test helpers always used an HTML4 parser. +#++ +# Rails.application.config.dom_testing_default_html_version = :html5 diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb index 50bcf4e..e8d0b2a 100644 --- a/config/initializers/permissions_policy.rb +++ b/config/initializers/permissions_policy.rb @@ -1,12 +1,15 @@ # frozen_string_literal: true + +# Be sure to restart your server when you modify this file. + # Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" +# information see: https://developers.google.com/web/updates/2018/06/feature-policy + +# Rails.application.config.permissions_policy do |policy| +# policy.camera :none +# policy.gyroscope :none +# policy.microphone :none +# policy.usb :none +# policy.fullscreen :self +# policy.payment :self, "https://secure.example.com" # end diff --git a/db/migrate/20240401075141_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20240401075141_add_service_name_to_active_storage_blobs.active_storage.rb new file mode 100644 index 0000000..735df75 --- /dev/null +++ b/db/migrate/20240401075141_add_service_name_to_active_storage_blobs.active_storage.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +# This migration comes from active_storage (originally 20190112182829) +class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] + def up + return unless table_exists?(:active_storage_blobs) + + return if column_exists?(:active_storage_blobs, :service_name) + + add_column :active_storage_blobs, :service_name, :string + + if (configured_service = ActiveStorage::Blob.service.name) + ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) + end + + change_column :active_storage_blobs, :service_name, :string, null: false + end + + def down + return unless table_exists?(:active_storage_blobs) + + remove_column :active_storage_blobs, :service_name + end +end diff --git a/db/migrate/20240401075142_create_active_storage_variant_records.active_storage.rb b/db/migrate/20240401075142_create_active_storage_variant_records.active_storage.rb new file mode 100644 index 0000000..305ae98 --- /dev/null +++ b/db/migrate/20240401075142_create_active_storage_variant_records.active_storage.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +# This migration comes from active_storage (originally 20191206030411) +class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] + def change + return unless table_exists?(:active_storage_blobs) + + # Use Active Record's configured type for primary key + create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |table| + table.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type + table.string :variation_digest, null: false + + table.index %i[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true + table.foreign_key :active_storage_blobs, column: :blob_id + end + end + + private + + def primary_key_type + config = Rails.configuration.generators + config.options[config.orm][:primary_key_type] || :primary_key + end + + def blobs_primary_key_type + pkey_name = connection.primary_key(:active_storage_blobs) + pkey_column = connection.columns(:active_storage_blobs).find { |column| column.name == pkey_name } + pkey_column.bigint? ? :bigint : pkey_column.type + end +end diff --git a/db/migrate/20240401075143_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20240401075143_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb new file mode 100644 index 0000000..6f31822 --- /dev/null +++ b/db/migrate/20240401075143_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# This migration comes from active_storage (originally 20211119233751) +class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0] + def change + return unless table_exists?(:active_storage_blobs) + + change_column_null(:active_storage_blobs, :checksum, true) + end +end diff --git a/db/schema.rb b/db/schema.rb index 31a4a0b..4535241 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -10,28 +12,28 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2021_10_23_111638) do +ActiveRecord::Schema[7.1].define(version: 20_240_401_075_143) do # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" + enable_extension 'plpgsql' - create_table "categories", force: :cascade do |t| - t.string "name" - t.string "note" - t.boolean "visible", default: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + create_table 'categories', force: :cascade do |t| + t.string 'name' + t.string 'note' + t.boolean 'visible', default: false, null: false + t.datetime 'created_at', null: false + t.datetime 'updated_at', null: false end - create_table "reports", force: :cascade do |t| - t.bigint "category_id", null: false - t.decimal "budgeted", precision: 10, scale: 3 - t.decimal "activity", precision: 10, scale: 3 - t.decimal "balance", precision: 10, scale: 3 - t.date "date" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["category_id"], name: "index_reports_on_category_id" + create_table 'reports', force: :cascade do |t| + t.bigint 'category_id', null: false + t.decimal 'budgeted', precision: 10, scale: 3 + t.decimal 'activity', precision: 10, scale: 3 + t.decimal 'balance', precision: 10, scale: 3 + t.date 'date' + t.datetime 'created_at', null: false + t.datetime 'updated_at', null: false + t.index ['category_id'], name: 'index_reports_on_category_id' end - add_foreign_key "reports", "categories" + add_foreign_key 'reports', 'categories' end diff --git a/db/seeds.rb b/db/seeds.rb index 0664d1b..6533326 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This file should contain all the record creation needed to seed the database with its default values. # The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup). # diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..761c82b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,38 @@ +services: + db: + image: postgres:16 + ports: + - "5432:5432" + networks: + - db + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + POSTGRES_DB: ynab_development + restart: always + healthcheck: + test: [ "CMD-SHELL", "pg_isready -d postgres" ] + interval: 30s + timeout: 10s + retries: 5 + + web: + build: + context: . + target: development + image: gmmcal-ynab:development + command: bin/rails server -b 0.0.0.0 + depends_on: + - db + networks: + - db + environment: + RAILS_ENV: development + DATABASE_HOST: db + DATABASE_USERNAME: postgres + DATABASE_PASSWORD: password + ports: + - "3000:3000" + +networks: + db: