update local env to use docker

.env.example

@@ -0,0 +1,15 @@
+WEB_CONCURRENCY=2
+
+RAILS_ENV=development
+
+DATABASE_URL=postgres://rails:[email protected]:5433/magma_chat_development
+
+REDIS_URL=redis://:[email protected]:6380/0
+
+MARQO_URL=https://marqo_url/
+
+
+GOOGLE_CLIENT_ID=.......
+GOOGLE_CLIENT_SECRET=.......
+
+OPENAI_ACCESS_TOKEN=.......

.gitignore

@@ -6,7 +6,7 @@
 
 # ignore dots
 .env
-.env.development
+.env.local
 .DS_Store
 .docker
 

Dockerfile

@@ -35,15 +35,15 @@ COPY . .
 RUN bundle exec bootsnap precompile app/ lib/
 
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
-RUN SECRET_KEY_BASE=1 ./bin/rails assets:precompile
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
 
 # Final stage for app image
 FROM base
 
 # Install packages needed for deployment
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y gnupg2 libpq-dev && \
+    apt-get install --no-install-recommends -y libpq-dev && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Copy built artifacts: gems, application

Gemfile

@@ -54,7 +54,6 @@ gem "bootsnap", require: false
 
 gem "action-cable-redis-backport", "~> 1"
 gem "cable_ready", "~> 5.0.0"
-gem "dotenv", "~> 2.8"
 gem "faker"
 gem "instant18n", "~> 0.3.0"
 gem "httparty"

Gemfile.lock

@@ -406,7 +406,6 @@ DEPENDENCIES
   cable_ready (~> 5.0.0)
   capybara
   debug
-  dotenv (~> 2.8)
   error_highlight (>= 0.4.0)
   factory_bot_rails
   faker

README.md

@@ -54,17 +54,23 @@ Here are some of the cool features we are envisioning:
 
 * Ruby 3.2.1
 
-* Requires Postgres and Redis to be running
+* Requires Docker
 
-* Run `rails db:setup` to create the database
+* Long-term memory for bots requires Marqo, an open-source, multi-modal vector search engine that you can download and run locally using Docker. More information at https://www.marqo.ai/
 
-* Run `bin/dev` to fire up the app
+configure environment variables
+```sh
+cp .env.example .env.local
+```
 
-* Long-term memory for bots requires Marqo, an open-source, multi-modal vector search engine that you can download and run locally using Docker. More information at https://www.marqo.ai/
+fire up the app
+```sh
+docker-compose up --build
+```
 
 ### OpenAI API
 
-Make sure you have `OPENAI_ACCESS_TOKEN` environment variable set. (Developers, use a `.env` file in the root of the project.)
+Make sure you have `OPENAI_ACCESS_TOKEN` environment variable set. (Developers, use a `.env.local` file in the root of the project.)
 
 ### Google Oauth
 

config/application.rb

@@ -1,4 +1,3 @@
-require "dotenv/load"
 require_relative "boot"
 
 require "rails/all"

config/boot.rb

@@ -3,9 +3,3 @@
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.
 
-if ENV["RAILS_ENV"] == "production"
-  require "dotenv/load"
-else
-  require 'dotenv'
-  Dotenv.load('.env.development')
-end

config/environments/production.rb

@@ -94,11 +94,10 @@
   # 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
+  # Log to STDOUT by default
+  config.logger = ActiveSupport::Logger.new(STDOUT)
+    .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+    .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false

db/development.sql

@@ -0,0 +1 @@
+CREATE DATABASE magma_chat_development;

db/production.sql

@@ -0,0 +1 @@
+CREATE DATABASE magma_chat_production;

docker-compose.yml

@@ -10,12 +10,7 @@ x-app: &default-app
     db:
       condition: service_healthy
   env_file:
-    - .env
-  environment:
-    - RAILS_ENV=development
-    - DATABASE_URL=postgres://postgres:[email protected]:5432/magma_chat_development
-    - REDIS_URL=redis://host.docker.internal:6379/1
-    - MARQO_URL=https://marqo-ai.magmalabs.io/
+    - .env.local
   tty: true
   volumes:
     - .:/rails
@@ -25,11 +20,7 @@ x-assets: &default-assets
     context: "."
     dockerfile: Dockerfile
   env_file:
-    - .env
-  environment:
-    - RAILS_ENV=development
-    - DATABASE_URL=postgres://postgres:[email protected]:5432/magma_chat_development
-    - REDIS_URL=redis://host.docker.internal:6379/1
+    - .env.local
   tty: true
   volumes:
     - .:/rails
@@ -44,9 +35,9 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-    command: redis-server
+    command: redis-server --requirepass password
     ports:
-      - '6379:6379'
+      - '6380:6379'
     volumes:
       - 'redis-data:/data'
     networks:
@@ -55,20 +46,20 @@ services:
   db:
     image: postgres:15
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U rails"]
       interval: 5s
       timeout: 5s
       retries: 5
     ports:
-      - "5432:5432"
+      - "5433:5432"
     restart: always
     environment:
-      - POSTGRES_USER=postgres
+      - POSTGRES_USER=rails
       - POSTGRES_PASSWORD=password
       - POSTGRES_HOST_AUTH_METHOD=trust
-      - POSTGRES_DB=magma_chat_development
     volumes:
       - 'pg-data:/var/lib/postgresql/data'
+      - './db/development.sql:/docker-entrypoint-initdb.d/setup.sql'
     networks:
       default: