From 9ef9eb25607f3419b91a2a41ccf78fc3c254593d Mon Sep 17 00:00:00 2001 From: Sigma9 Date: Tue, 27 Aug 2024 14:11:35 +0100 Subject: [PATCH] local development configs --- Dockerfile | 6 +++--- Gemfile | 2 +- config/database.yml | 3 +++ config/dotenv.rb | 1 - db/schema.rb | 2 +- docker-compose.yml | 17 ++++++++++++++++- lib/puma/plugin/redis_server.rb | 5 +++-- tailwind.config.js | 24 ++++++++++++++++++++---- 8 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 022fc808..069410c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontf FROM ruby:3.3.3-alpine as webpack -ENV RAILS_ENV=production -ENV NODE_ENV=production +ENV RAILS_ENV=development +ENV NODE_ENV=development WORKDIR /app @@ -34,7 +34,7 @@ RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker FROM ruby:3.3.3-alpine as app -ENV RAILS_ENV=production +ENV RAILS_ENV=development ENV BUNDLE_WITHOUT="development:test" ENV LD_PRELOAD=/lib/libgcompat.so.0 ENV OPENSSL_CONF=/app/openssl_legacy.cnf diff --git a/Gemfile b/Gemfile index 7c68b0a4..71218bb1 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,6 @@ gem 'cancancan' gem 'csv' gem 'devise' gem 'devise-two-factor' -gem 'dotenv', require: false gem 'email_typo' gem 'faraday' gem 'faraday-follow_redirects' @@ -61,6 +60,7 @@ group :development, :test do gem 'rubocop-rails', require: false gem 'rubocop-rspec', require: false gem 'simplecov', require: false + gem 'dotenv' end group :development do diff --git a/config/database.yml b/config/database.yml index f26c54ef..bf430e8e 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,6 +6,9 @@ default: &default development: <<: *default database: docuseal_dev + port: <%= ENV['DATABASE_PORT'] %> + username: <%= ENV['DATABASE_USER'] %> + password: <%= ENV['DATABASE_PASSWORD'] %> test: <<: *default diff --git a/config/dotenv.rb b/config/dotenv.rb index 319785e7..0b35f18e 100644 --- a/config/dotenv.rb +++ b/config/dotenv.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true - if ENV['RAILS_ENV'] == 'production' if !ENV['AWS_SECRET_MANAGER_ID'].to_s.empty? require 'aws-sdk-secretsmanager' diff --git a/db/schema.rb b/db/schema.rb index de8df185..ad004228 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -94,7 +94,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_16_121641) do t.string "event_name", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[]))" + t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text]))" t.index ["submitter_id"], name: "index_document_generation_events_on_submitter_id" end diff --git a/docker-compose.yml b/docker-compose.yml index d5cd1e98..22d68a54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,16 +3,27 @@ services: depends_on: postgres: condition: service_healthy - build: . + redis: + condition: service_started + build: + context: . + dockerfile: Dockerfile ports: - 3000:3000 volumes: - ./docuseal:/data/docuseal + environment: - HOST=${HOST} - FORCE_SSL=${HOST} - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal + - RAILS_ENV=development + redis: + image: redis:latest + ports: + - 6379:6379 + postgres: image: postgres:15 volumes: @@ -26,6 +37,9 @@ services: interval: 5s timeout: 5s retries: 5 + ports: + - 5432:5432 + # caddy: # image: caddy:latest @@ -38,3 +52,4 @@ services: # - .:/data # environment: # - HOST=${HOST} + \ No newline at end of file diff --git a/lib/puma/plugin/redis_server.rb b/lib/puma/plugin/redis_server.rb index 03b29dbf..ef8b255e 100644 --- a/lib/puma/plugin/redis_server.rb +++ b/lib/puma/plugin/redis_server.rb @@ -52,9 +52,10 @@ Puma::Plugin.create do Process.setsid Dir.chdir(ENV.fetch('WORKDIR', nil)) unless ENV['WORKDIR'].to_s.empty? - - exec('redis-server', '--requirepass', Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}"), + if ENV['DOCKER_REDIS'].to_s.empty? + exec('redis-server', '--requirepass', Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}"), out: '/dev/null') + end end end diff --git a/tailwind.config.js b/tailwind.config.js index 20ceb9c5..7426d33c 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -6,10 +6,26 @@ module.exports = { themes: [ { winter: { - ...require("daisyui/src/theming/themes")["winter"], - "base-100": "#010066", - "base-200": "#010177", - "base-300": "#010277", +"primary": "#0055ff", +"primary-content": "#cee1ff", +"secondary": "#009b3d", +"secondary-content": "#000901", +"accent": "#0095eb", +"accent-content": "#000813", +"neutral": "#191611", +"neutral-content": "#cbcac9", +"base-100": "#092531", +"base-200": "#071f29", +"base-300": "#051922", +"base-content": "#c9cfd2", +"info": "#0088f3", +"info-content": "#000614", +"success": "#4ddb71", +"success-content": "#021104", +"warning": "#ffbc2a", +"warning-content": "#160d01", +"error": "#e92d4e", +"error-content": "#130102", }, docuseal: { 'color-scheme': 'light',