improvements to dummy app

Author: rsmithlal

.dokku/web.sh

@@ -2,5 +2,5 @@
 #!/bin/bash
 set -e
 
-mkdir -p tmp/pids
-bundle exec puma -C config/puma.rb
+mkdir -p spec/dummy/tmp/pids
+bash -c "rm -f spec/dummy/tmp/pids/server.pid && cd ./spec/dummy && bundle exec puma -C config/puma.rb"

Dockerfile

@@ -36,7 +36,9 @@ RUN apt-get update -qq \
 WORKDIR /community-engine
 
 # Copy Gemfile and Gemfile.lock
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock better_together.gemspec ./
+
+COPY lib lib
 
 # Install bundler and gems
 RUN gem uninstall bundler \
@@ -47,7 +49,8 @@ RUN gem uninstall bundler \
 COPY . .
 
 # Precompile assets and sync to S3
-RUN bundle exec rake assets:precompile
+RUN bundle exec rake app:assets:precompile
+RUN bundle exec rake app:assets:sync
 
 # Stage 2: Runtime environment
 FROM ruby:3.2.2
@@ -69,13 +72,13 @@ WORKDIR /community-engine
 # Copy the application code from the build stage
 COPY --from=builder /community-engine /community-engine
 
-# Create and set permissions for tmp/pids directory
-RUN mkdir -p tmp/pids
-RUN chmod -R 755 tmp
+# Create and set permissions for spec/dummy/tmp/pids directory
+RUN mkdir -p spec/dummy/tmp/pids
+RUN chmod -R 755 spec/dummy/tmp
 
 # Set environment variables
 ENV RAILS_ENV=production
 ENV RACK_ENV=production
 
 # Run the application
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]
+CMD ["./spec/dummy","bundle", "exec", "puma", "-C", "config/puma.rb"]

Gemfile

@@ -31,6 +31,9 @@ gem 'rails', '~> 7.0.8'
 
 # Redis for ActionCable and background jobs
 gem 'redis', '~> 5.2'
+
+gem 'rswag'
+
 # Sidekiq for background processing
 gem 'sidekiq', '~> 7.2.4'
 
@@ -57,7 +60,6 @@ group :development, :test do
   gem 'fuubar'
   # Pry for a powerful shell alternative to IRB
   gem 'pry'
-  gem 'rswag'
   # RuboCop for static code analysis
   gem 'rubocop'
 end

Gemfile.lock

@@ -167,7 +167,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     coveralls (0.7.1)
       multi_json (~> 1.3)

docker-compose.prod.yml

@@ -2,7 +2,7 @@ version: '3.6'
 
 volumes:
   community-engine-bundler-gems:
-  community-engine-db-data:
+  community-engine-db-data-prod:
   community-engine-redis:
 
 x-env-info: &env-info
@@ -16,6 +16,7 @@ x-app-shared: &app-shared
 services:
   app: &app
     <<: *app-shared
+    container_name: community-engine-app
     build: # "context" and "dockerfile" fields have to be under "build"
       args:
         AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
@@ -30,4 +31,10 @@ services:
     command: bash -c "rm -f spec/dummy/tmp/pids/server.pid && cd ./spec/dummy && bundle exec puma -C config/puma.rb"
     ports:
       - '5000:5000'
+  db:
+    <<: *env-info
+    volumes:
+      - community-engine-db-data-prod:/var/lib/postgresql/data
 
+  sidekiq:
+    <<: *app-shared

docker-compose.yml

@@ -42,7 +42,7 @@ services:
   sidekiq:
     <<: *app-shared
     container_name: community-engine-sidekiq
-    command: bundle exec sidekiq -C config/sidekiq.yml
+    command: bash -c "rm -f spec/dummy/tmp/pids/server.pid && cd ./spec/dummy && bundle exec sidekiq -C config/sidekiq.yml"
     depends_on:
       - app
 

spec/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: better_together_production

spec/dummy/config/database.yml

@@ -1,36 +1,64 @@
-# MySQL. Versions 5.1.10 and up are supported.
+# PostgreSQL. Versions 9.1 and up are supported.
 #
-# Install the MySQL driver
-#   gem install mysql2
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
 #
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
+# Configure Using Gemfile
+# gem 'pg'
 #
-# And be sure to use new-style password hashing:
-#   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
-#
-
 default: &default
   adapter: postgis
   encoding: unicode
-  # host: localhost
-  host: db
-  username: <%= ENV['POSTGRES_USER'] %>
-  password: <%= ENV['POSTGRES_PASSWORD'] %>
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  url: <%= ENV.fetch("DATABASE_URL") { 'postgres://postgres:postgres@community-engine-db' } %>
 
 development:
   <<: *default
-  database: community-engine_dummy_development
+  database: community_engine_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: community_engine
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: community-engine_dummy_test
+  database: community_engine_test
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is
@@ -44,7 +72,7 @@ test:
 # On Heroku and other platform providers, you may have a full connection URL
 # available as an environment variable. For example:
 #
-#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
 #
 # You can use this database configuration with:
 #
@@ -53,6 +81,4 @@ test:
 #
 production:
   <<: *default
-  database: community-engine_dummy_production
-  username: dummy
-  password: <%= ENV['BETTER_TOGETHER_DATABASE_PASSWORD'] %>
+  url: <%= ENV['DATABASE_URL'] %>

spec/dummy/config/environments/development.rb

@@ -65,6 +65,8 @@
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
+  config.sass.inline_source_maps = true
+
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 

spec/dummy/config/environments/production.rb

@@ -30,9 +30,10 @@
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = true
+  config.assets.compile = false
   config.assets.digest = true
   config.assets.enabled = true
+  config.assets.initialize_on_precompile = true
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   config.asset_host = ENV.fetch('ASSET_HOST')