From 27f6ded1e2a722737129b11a2ee7b9349647810a Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Mon, 25 Sep 2023 18:34:33 +0300 Subject: [PATCH] Move Blockscout-related configs to suave/devenv/blockscout subdir --- .gitignore | 6 +++--- .../envs/common-blockscout.env | 0 .../{ => blockscout}/envs/common-frontend.env | 0 .../{ => blockscout}/envs/common-stats.env | 0 .../envs/common-visualizer.env | 0 .../proxy/default.conf.template | 0 .../services/docker-compose-backend.yml | 0 .../services/docker-compose-db.yml | 0 .../services/docker-compose-frontend.yml | 0 .../services/docker-compose-nginx.yml | 0 .../services/docker-compose-redis.yml | 0 .../services/docker-compose-sig-provider.yml | 0 .../services/docker-compose-stats.yml | 0 .../services/docker-compose-visualizer.yml | 0 suave/devenv/docker-compose.yml | 19 ++++++++++--------- 15 files changed, 13 insertions(+), 12 deletions(-) rename suave/devenv/{ => blockscout}/envs/common-blockscout.env (100%) rename suave/devenv/{ => blockscout}/envs/common-frontend.env (100%) rename suave/devenv/{ => blockscout}/envs/common-stats.env (100%) rename suave/devenv/{ => blockscout}/envs/common-visualizer.env (100%) rename suave/devenv/{ => blockscout}/proxy/default.conf.template (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-backend.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-db.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-frontend.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-nginx.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-redis.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-sig-provider.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-stats.yml (100%) rename suave/devenv/{ => blockscout}/services/docker-compose-visualizer.yml (100%) diff --git a/.gitignore b/.gitignore index 80692beb6..aabcaad0f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,9 +47,9 @@ profile.cov /dashboard/assets/bundle.js.map /dashboard/assets/package-lock.json -/suave/devenv/services/blockscout-db-data -/suave/devenv/services/redis-data -/suave/devenv/services/stats-db-data +/suave/devenv/blockscout/services/blockscout-db-data +/suave/devenv/blockscout/services/redis-data +/suave/devenv/blockscout/services/stats-db-data **/yarn-error.log logs/ \ No newline at end of file diff --git a/suave/devenv/envs/common-blockscout.env b/suave/devenv/blockscout/envs/common-blockscout.env similarity index 100% rename from suave/devenv/envs/common-blockscout.env rename to suave/devenv/blockscout/envs/common-blockscout.env diff --git a/suave/devenv/envs/common-frontend.env b/suave/devenv/blockscout/envs/common-frontend.env similarity index 100% rename from suave/devenv/envs/common-frontend.env rename to suave/devenv/blockscout/envs/common-frontend.env diff --git a/suave/devenv/envs/common-stats.env b/suave/devenv/blockscout/envs/common-stats.env similarity index 100% rename from suave/devenv/envs/common-stats.env rename to suave/devenv/blockscout/envs/common-stats.env diff --git a/suave/devenv/envs/common-visualizer.env b/suave/devenv/blockscout/envs/common-visualizer.env similarity index 100% rename from suave/devenv/envs/common-visualizer.env rename to suave/devenv/blockscout/envs/common-visualizer.env diff --git a/suave/devenv/proxy/default.conf.template b/suave/devenv/blockscout/proxy/default.conf.template similarity index 100% rename from suave/devenv/proxy/default.conf.template rename to suave/devenv/blockscout/proxy/default.conf.template diff --git a/suave/devenv/services/docker-compose-backend.yml b/suave/devenv/blockscout/services/docker-compose-backend.yml similarity index 100% rename from suave/devenv/services/docker-compose-backend.yml rename to suave/devenv/blockscout/services/docker-compose-backend.yml diff --git a/suave/devenv/services/docker-compose-db.yml b/suave/devenv/blockscout/services/docker-compose-db.yml similarity index 100% rename from suave/devenv/services/docker-compose-db.yml rename to suave/devenv/blockscout/services/docker-compose-db.yml diff --git a/suave/devenv/services/docker-compose-frontend.yml b/suave/devenv/blockscout/services/docker-compose-frontend.yml similarity index 100% rename from suave/devenv/services/docker-compose-frontend.yml rename to suave/devenv/blockscout/services/docker-compose-frontend.yml diff --git a/suave/devenv/services/docker-compose-nginx.yml b/suave/devenv/blockscout/services/docker-compose-nginx.yml similarity index 100% rename from suave/devenv/services/docker-compose-nginx.yml rename to suave/devenv/blockscout/services/docker-compose-nginx.yml diff --git a/suave/devenv/services/docker-compose-redis.yml b/suave/devenv/blockscout/services/docker-compose-redis.yml similarity index 100% rename from suave/devenv/services/docker-compose-redis.yml rename to suave/devenv/blockscout/services/docker-compose-redis.yml diff --git a/suave/devenv/services/docker-compose-sig-provider.yml b/suave/devenv/blockscout/services/docker-compose-sig-provider.yml similarity index 100% rename from suave/devenv/services/docker-compose-sig-provider.yml rename to suave/devenv/blockscout/services/docker-compose-sig-provider.yml diff --git a/suave/devenv/services/docker-compose-stats.yml b/suave/devenv/blockscout/services/docker-compose-stats.yml similarity index 100% rename from suave/devenv/services/docker-compose-stats.yml rename to suave/devenv/blockscout/services/docker-compose-stats.yml diff --git a/suave/devenv/services/docker-compose-visualizer.yml b/suave/devenv/blockscout/services/docker-compose-visualizer.yml similarity index 100% rename from suave/devenv/services/docker-compose-visualizer.yml rename to suave/devenv/blockscout/services/docker-compose-visualizer.yml diff --git a/suave/devenv/docker-compose.yml b/suave/devenv/docker-compose.yml index 70a8ad6d2..5f0f09dcd 100644 --- a/suave/devenv/docker-compose.yml +++ b/suave/devenv/docker-compose.yml @@ -34,14 +34,15 @@ services: - --ws ports: - 8555:8545 + redis_db: extends: - file: ./services/docker-compose-redis.yml + file: ./blockscout/services/docker-compose-redis.yml service: redis_db db: extends: - file: ./services/docker-compose-db.yml + file: ./blockscout/services/docker-compose-db.yml service: db backend: @@ -49,7 +50,7 @@ services: - db - redis_db extends: - file: ./services/docker-compose-backend.yml + file: ./blockscout/services/docker-compose-backend.yml service: backend links: - db:database @@ -63,33 +64,33 @@ services: visualizer: extends: - file: ./services/docker-compose-visualizer.yml + file: ./blockscout/services/docker-compose-visualizer.yml service: visualizer sig-provider: extends: - file: ./services/docker-compose-sig-provider.yml + file: ./blockscout/services/docker-compose-sig-provider.yml service: sig-provider frontend: depends_on: - backend extends: - file: ./services/docker-compose-frontend.yml + file: ./blockscout/services/docker-compose-frontend.yml service: frontend stats-db: depends_on: - backend extends: - file: ./services/docker-compose-stats.yml + file: ./blockscout/services/docker-compose-stats.yml service: stats-db stats: depends_on: - stats-db extends: - file: ./services/docker-compose-stats.yml + file: ./blockscout/services/docker-compose-stats.yml service: stats proxy: @@ -98,5 +99,5 @@ services: - frontend - stats extends: - file: ./services/docker-compose-nginx.yml + file: ./blockscout/services/docker-compose-nginx.yml service: proxy