Fix docker compose

apps/explorer/lib/explorer/application.ex

@@ -179,8 +179,6 @@ defmodule Explorer.Application do
   end
 
   defp redix_opts do
-    config = Application.get_env(:explorer, Redix)
-
-    [name: :redix, host: config[:host], port: config[:port]]
+    {System.get_env("ACCOUNT_REDIS_URL") || "redis://127.0.0.1:6379", [name: :redix]}
   end
 end

config/runtime/dev.exs

@@ -103,17 +103,6 @@ variant =
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/dev")
 
-redis_port =
-  case System.get_env("ACCOUNT_REDIS_PORT") && Integer.parse(System.get_env("ACCOUNT_REDIS_PORT")) do
-    {port, _} -> port
-    :error -> nil
-    nil -> nil
-  end
-
-config :explorer, Redix,
-  host: System.get_env("ACCOUNT_REDIS_HOST_URL") || "127.0.0.1",
-  port: redis_port || 6379
-
 ###############
 ### Indexer ###
 ###############

config/runtime/prod.exs

@@ -70,17 +70,6 @@ variant =
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/prod")
 
-redis_port =
-  case System.get_env("ACCOUNT_REDIS_PORT") && Integer.parse(System.get_env("ACCOUNT_REDIS_PORT")) do
-    {port, _} -> port
-    :error -> nil
-    nil -> nil
-  end
-
-config :explorer, Redix,
-  host: System.get_env("ACCOUNT_REDIS_HOST_URL"),
-  port: redis_port
-
 ###############
 ### Indexer ###
 ###############

config/runtime/test.exs

@@ -24,17 +24,6 @@ variant =
 
 Code.require_file("#{variant}.exs", "apps/explorer/config/test")
 
-redis_port =
-  case System.get_env("ACCOUNT_REDIS_PORT") && Integer.parse(System.get_env("ACCOUNT_REDIS_PORT")) do
-    {port, _} -> port
-    :error -> nil
-    nil -> nil
-  end
-
-config :explorer, Redix,
-  host: System.get_env("ACCOUNT_REDIS_HOST_URL") || "127.0.0.1",
-  port: redis_port || 6379
-
 ###############
 ### Indexer ###
 ###############

docker-compose/docker-compose-no-build-ganache.yml

@@ -1,6 +1,10 @@
 version: '3.8'
 
 services:
+  redis_db:
+    image: 'redis:alpine'
+    command: redis-server
+
   db:
     image: postgres:14
     restart: always
@@ -16,6 +20,7 @@ services:
     depends_on:
       - db
       - smart-contract-verifier
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     restart: always
     container_name: 'blockscout'

docker-compose/docker-compose-no-build-geth.yml

@@ -1,6 +1,10 @@
 version: '3.8'
 
 services:
+  redis_db:
+    image: 'redis:alpine'
+    command: redis-server
+
   db:
     image: postgres:14
     restart: always
@@ -18,6 +22,7 @@ services:
     depends_on:
       - db
       - smart-contract-verifier
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     restart: always
     container_name: 'blockscout'

docker-compose/docker-compose-no-build-hardhat-network.yml

@@ -1,6 +1,10 @@
 version: '3.8'
 
 services:
+  redis_db:
+    image: 'redis:alpine'
+    command: redis-server
+
   db:
     image: postgres:14
     restart: always
@@ -16,6 +20,7 @@ services:
     depends_on:
       - db
       - smart-contract-verifier
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     restart: always
     container_name: 'blockscout'

docker-compose/docker-compose-no-build-open-ethereum-nethermind.yml

@@ -1,6 +1,10 @@
 version: '3.8'
 
 services:
+  redis_db:
+    image: 'redis:alpine'
+    command: redis-server
+
   db:
     image: postgres:14
     restart: always
@@ -18,6 +22,7 @@ services:
     depends_on:
       - db
       - smart-contract-verifier
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     restart: always
     container_name: 'blockscout'

docker-compose/docker-compose-no-rust-verification.yml

@@ -1,6 +1,10 @@
 version: '3.8'
 
 services:
+  redis_db:
+    image: 'redis:alpine'
+    command: redis-server
+
   db:
     image: postgres:14
     restart: always
@@ -15,6 +19,7 @@ services:
   blockscout:
     depends_on:
       - db
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     build:
       context: ..

docker-compose/docker-compose.yml

@@ -1,11 +1,9 @@
 version: '3.8'
 
 services:
-  redis:
-    image: "redis:alpine"
+  redis_db:
+    image: 'redis:alpine'
     command: redis-server
-    ports:
-      - 6379:6379
 
   db:
     image: postgres:14
@@ -22,6 +20,7 @@ services:
     depends_on:
       - db
       - smart-contract-verifier
+      - redis_db
     image: blockscout/blockscout:${DOCKER_TAG:-latest}
     build:
       context: ..

docker-compose/envs/common-blockscout.env

@@ -138,5 +138,5 @@ RUST_VERIFICATION_SERVICE_URL=http://host.docker.internal:8043/
 # ACCOUNT_SENDGRID_SENDER=
 # ACCOUNT_SENDGRID_TEMPLATE=
 ACCOUNT_CLOAK_KEY=
-ACCOUNT_REDIS_HOST_URL=http://host.docker.internal
-ACCOUNT_REDIS_PORT=6379
+ACCOUNT_ENABLED=false
+ACCOUNT_REDIS_URL=redis://redis_db:6379