diff --git a/.github/workflows/rails_application.yml b/.github/workflows/rails_application.yml index d8e204af..8b08e82a 100644 --- a/.github/workflows/rails_application.yml +++ b/.github/workflows/rails_application.yml @@ -10,7 +10,6 @@ jobs: fail-fast: false env: WORKING_DIRECTORY: rails_application - REDIS_TLS_URL: redis://localhost:6379/0 services: postgres_11: image: postgres:11 @@ -20,10 +19,6 @@ jobs: ports: - 5432:5432 options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - redis: - image: redis - ports: [ "6379:6379" ] - options: --entrypoint redis-server steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 @@ -57,7 +52,6 @@ jobs: strategy: fail-fast: false env: - REDIS_TLS_URL: redis://localhost:6379/0 WORKING_DIRECTORY: rails_application services: postgres_11: @@ -68,10 +62,6 @@ jobs: ports: - 5432:5432 options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - redis: - image: redis - ports: [ "6379:6379" ] - options: --entrypoint redis-server steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 diff --git a/rails_application/.env.development b/rails_application/.env.development index aa11c3ea..3aedc439 100644 --- a/rails_application/.env.development +++ b/rails_application/.env.development @@ -1,2 +1 @@ -REDIS_URL=redis://localhost:6379/0 DATABASE_URL=postgres://postgres:secret@localhost/cqrs-es-sample-with-res_development \ No newline at end of file diff --git a/rails_application/.env.test b/rails_application/.env.test index 093fab6b..1fb34f10 100644 --- a/rails_application/.env.test +++ b/rails_application/.env.test @@ -1,2 +1 @@ -REDIS_URL=redis://localhost:6379/0 DATABASE_URL=postgres://postgres:secret@localhost/cqrs-es-sample-with-res_test diff --git a/rails_application/Gemfile b/rails_application/Gemfile index 61f8138d..5eeeb7a8 100644 --- a/rails_application/Gemfile +++ b/rails_application/Gemfile @@ -16,7 +16,6 @@ gem "stimulus-rails" gem "importmap-rails", "~> 1.1" gem "rails_event_store", ">= 2.15.0", "< 3.0" gem 'arbre' -gem 'redis', '~> 5.0' group :development do gem "listen", "~> 3.3" diff --git a/rails_application/Gemfile.lock b/rails_application/Gemfile.lock index 6c3d8228..c95eeb88 100644 --- a/rails_application/Gemfile.lock +++ b/rails_application/Gemfile.lock @@ -263,10 +263,6 @@ GEM ffi (~> 1.0) rdoc (6.7.0) psych (>= 4.0.0) - redis (5.3.0) - redis-client (>= 0.22.0) - redis-client (0.22.2) - connection_pool regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) @@ -346,7 +342,6 @@ DEPENDENCIES puma (~> 5.6) rails (= 7.2.0) rails_event_store (>= 2.15.0, < 3.0) - redis (~> 5.0) skylight sprockets-rails stimulus-rails diff --git a/rails_application/README.md b/rails_application/README.md index 96e7fbab..e372a0a8 100644 --- a/rails_application/README.md +++ b/rails_application/README.md @@ -4,35 +4,33 @@ ## Setup -### Postgresql and Redis +### Postgresql #### Docker -If you would like to use Docker image with PostgreSQL and Redis provided by us, +If you would like to use Docker image with PostgreSQL provided by us, run `docker-compose up -d`. You're done for this step. #### Installed in the system -If you have PostgreSQL or Redis installed directly in your system and prefer -to use them, create +If you have PostgreSQL installed directly in your system and prefer +to use it, create - `.env.development.local` containing: ``` DATABASE_URL=postgresql:///ecommerce_development - REDIS_URL=redis://localhost:6379/1 ``` * `.env.test.local` containing: ``` DATABASE_URL=postgresql:///ecommerce_test - REDIS_URL=redis://localhost:6379/1 ``` It should would work for most of the cases. If you have more sophisticated setup, -you need to update `DATABASE_URL` and `REDIS_URL` accordingly. +you need to update `DATABASE_URL`. ### Kickstart diff --git a/rails_application/docker-compose.yml b/rails_application/docker-compose.yml index 92cf3c20..df281b3c 100644 --- a/rails_application/docker-compose.yml +++ b/rails_application/docker-compose.yml @@ -9,11 +9,4 @@ services: - POSTGRES_DB=cqrs-es-sample-with-res - POSTGRES_PASSWORD=secret ports: - - "5432:5432" - redis: - image: 'bitnami/redis:latest' - restart: always - environment: - - ALLOW_EMPTY_PASSWORD=yes - ports: - - "6379:6379" \ No newline at end of file + - "5432:5432" \ No newline at end of file