From 00003264982fd70985f9fba78eee37511686296c Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sun, 8 Jun 2025 12:54:19 +0200 Subject: [PATCH] Update CI config --- .circleci/config.yml | 14 +++++++++++--- .devcontainer/docker-compose.yml | 6 +++++- docker/docker-compose.production.yml | 3 +++ docker/docker-compose.yml | 3 +++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1dd09644..2fe2b07f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,10 +11,16 @@ jobs: environment: RAILS_ENV: test CI: true + DATABASE_NAME: dawarich_test + QUEUE_DATABASE_NAME: dawarich_test_queue + QUEUE_DATABASE_PASSWORD: mysecretpassword + DATABASE_USERNAME: postgres + DATABASE_PASSWORD: mysecretpassword + DATABASE_HOST: localhost - image: cimg/postgres:13.3-postgis environment: POSTGRES_USER: postgres - POSTGRES_DB: test_database + POSTGRES_DB: dawarich_test POSTGRES_PASSWORD: mysecretpassword - image: selenium/standalone-chrome:latest name: chrome @@ -39,8 +45,10 @@ jobs: - run: name: Database Setup command: | - bundle exec rails db:create - bundle exec rails db:schema:load + bundle exec rails db:create RAILS_ENV=test + bundle exec rails db:schema:load RAILS_ENV=test + # Create the queue database manually if it doesn't exist + PGPASSWORD=mysecretpassword createdb -h localhost -U postgres dawarich_test_queue || true - run: name: Run RSpec tests command: bundle exec rspec diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 1fd2a7ac..cf658aa5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -10,6 +10,7 @@ services: - dawarich_public:/var/app/public - dawarich_watched:/var/app/tmp/imports/watched - dawarich_storage:/var/app/storage + - dawarich_sqlite_data:/dawarich_sqlite_data networks: - dawarich ports: @@ -24,8 +25,11 @@ services: DATABASE_PASSWORD: password DATABASE_NAME: dawarich_development # PostgreSQL database name for solid_queue - QUEUE_DATABASE_NAME: dawarich_development_queue + QUEUE_DATABASE_HOST: dawarich_db + QUEUE_DATABASE_USERNAME: postgres QUEUE_DATABASE_PASSWORD: password + QUEUE_DATABASE_PORT: 5432 + QUEUE_DATABASE_NAME: dawarich_development_queue # SQLite database paths for cache and cable databases CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3 CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3 diff --git a/docker/docker-compose.production.yml b/docker/docker-compose.production.yml index ca5f596e..40ce7c74 100644 --- a/docker/docker-compose.production.yml +++ b/docker/docker-compose.production.yml @@ -49,6 +49,9 @@ services: # PostgreSQL database name for solid_queue QUEUE_DATABASE_NAME: dawarich_production_queue QUEUE_DATABASE_PASSWORD: password + QUEUE_DATABASE_USERNAME: postgres + QUEUE_DATABASE_HOST: dawarich_db + QUEUE_DATABASE_PORT: 5432 # SQLite database paths for cache and cable databases CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cache.sqlite3 CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cable.sqlite3 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e0204c5a..38faea53 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -51,6 +51,9 @@ services: # PostgreSQL database name for solid_queue QUEUE_DATABASE_NAME: dawarich_development_queue QUEUE_DATABASE_PASSWORD: password + QUEUE_DATABASE_USERNAME: postgres + QUEUE_DATABASE_HOST: dawarich_db + QUEUE_DATABASE_PORT: 5432 # SQLite database paths for cache and cable databases CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3 CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3