From 0817b2be70301a01e9e076d51a72fbfed2045f3a Mon Sep 17 00:00:00 2001 From: DaMandal0rian Date: Mon, 6 Nov 2023 13:26:49 +0300 Subject: [PATCH 1/2] add gemini-3g configuration nginx config cleanup add db backend compose version upgrade --- .../docker-compose-no-build-erigon.yml | 16 +++++++------- ...cker-compose-no-build-external-backend.yml | 2 +- ...ker-compose-no-build-external-frontend.yml | 12 +++++----- .../docker-compose-no-build-ganache.yml | 22 +++++++++---------- ...compose-no-build-geth-clique-consensus.yml | 18 +++++++-------- .../docker-compose-no-build-geth.yml | 16 +++++++------- ...ocker-compose-no-build-hardhat-network.yml | 18 +++++++-------- .../docker-compose-no-build-nethermind.yml | 16 +++++++------- ...ocker-compose-no-build-no-db-container.yml | 14 ++++++------ docker-compose/docker-compose.yml | 18 +++++++-------- docker-compose/envs/common-blockscout.env | 8 +++---- docker-compose/envs/common-frontend.env | 10 ++++----- docker-compose/proxy/backend.conf | 10 ++++----- docker-compose/proxy/nginx.conf | 2 +- .../services/docker-compose-certbot.yml | 2 +- docker-compose/services/docker-compose-db.yml | 16 ++++++++++++++ .../services/docker-compose-frontend.yml | 6 ++--- .../services/docker-compose-nginx.yml | 2 +- .../services/docker-compose-redis.yml | 4 ++-- .../services/docker-compose-sig-provider.yml | 4 ++-- ...docker-compose-smart-contract-verifier.yml | 6 ++--- .../services/docker-compose-stats.yml | 16 +++++++------- .../services/docker-compose-visualizer.yml | 6 ++--- 23 files changed, 130 insertions(+), 114 deletions(-) create mode 100644 docker-compose/services/docker-compose-db.yml diff --git a/docker-compose/docker-compose-no-build-erigon.yml b/docker-compose/docker-compose-no-build-erigon.yml index ded39cde19bc..09e05248e9f8 100644 --- a/docker-compose/docker-compose-no-build-erigon.yml +++ b/docker-compose/docker-compose-no-build-erigon.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,19 +19,19 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'erigon' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "erigon" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-external-backend.yml b/docker-compose/docker-compose-no-build-external-backend.yml index 8520f2000a4e..e97ebbdec277 100644 --- a/docker-compose/docker-compose-no-build-external-backend.yml +++ b/docker-compose/docker-compose-no-build-external-backend.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: diff --git a/docker-compose/docker-compose-no-build-external-frontend.yml b/docker-compose/docker-compose-no-build-external-frontend.yml index a8933b928902..a9c662b54ace 100644 --- a/docker-compose/docker-compose-no-build-external-frontend.yml +++ b/docker-compose/docker-compose-no-build-external-frontend.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: redis_db: @@ -16,7 +16,7 @@ services: - db - smart-contract-verifier - redis_db - image: blockscout/blockscout:${DOCKER_TAG:-latest} + image: ghcr.io/subspace/blockscout-backend@sha256:5ab061750801c713064b510068c30edd6d5854068a3b093b658279e7424f7db4 build: context: .. dockerfile: ./docker/Dockerfile @@ -42,9 +42,9 @@ services: - ./envs/common-blockscout.env environment: ETHEREUM_JSONRPC_VARIANT: "ganache" - ETHEREUM_JSONRPC_HTTP_URL: https://domain-3.evm.gemini-3f.subspace.network - ETHEREUM_JSONRPC_TRACE_URL: https://domain-3.evm.gemini-3f.subspace.network - ETHEREUM_JSONRPC_WS_URL: wss://domain-3.evm.gemini-3f.subspace.network/ws + ETHEREUM_JSONRPC_HTTP_URL: https://nova.gemini-3g.subspace.network/ws + ETHEREUM_JSONRPC_TRACE_URL: https://nova.gemini-3g.subspace.network/ws + ETHEREUM_JSONRPC_WS_URL: wss://nova.gemini-3g.subspace.network/ws INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: "true" INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: "true" DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false @@ -115,6 +115,6 @@ services: - "/:/host:ro" - "/var/run/docker.sock:/var/run/docker.sock" environment: - NRIA_LICENSE_KEY: ${NR_API_KEY} + NRIA_LICENSE_KEY: "${NR_API_KEY}" NRIA_DISPLAY_NAME: "blockscout-gemini-3f" restart: unless-stopped diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml index e02daf2fa700..b0d2fbd555f9 100644 --- a/docker-compose/docker-compose-no-build-ganache.yml +++ b/docker-compose/docker-compose-no-build-ganache.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,22 +19,22 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'ganache' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/ - INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: 'true' - INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true' - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false - CHAIN_ID: '1337' + ETHEREUM_JSONRPC_VARIANT: "ganache" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/ + INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: "true" + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: "true" + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + CHAIN_ID: "1337" volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml index b168c2d3a0e1..62f3b42a87ce 100644 --- a/docker-compose/docker-compose-no-build-geth-clique-consensus.yml +++ b/docker-compose/docker-compose-no-build-geth-clique-consensus.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,20 +19,20 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'geth' - BLOCK_TRANSFORMER: 'clique' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "geth" + BLOCK_TRANSFORMER: "clique" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml index b060cf6fcf36..4f18e9dad939 100644 --- a/docker-compose/docker-compose-no-build-geth.yml +++ b/docker-compose/docker-compose-no-build-geth.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,19 +19,19 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'geth' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "geth" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml index a8838e7b6c74..1914a5b57dfd 100644 --- a/docker-compose/docker-compose-no-build-hardhat-network.yml +++ b/docker-compose/docker-compose-no-build-hardhat-network.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,20 +19,20 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'geth' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/ - INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true' - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "geth" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/ + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: "true" + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-nethermind.yml b/docker-compose/docker-compose-no-build-nethermind.yml index f5c4efd55363..18529e493ef7 100644 --- a/docker-compose/docker-compose-no-build-nethermind.yml +++ b/docker-compose/docker-compose-no-build-nethermind.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -19,19 +19,19 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'nethermind' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "nethermind" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml index b183fcc21edb..a0cffe1d27b9 100644 --- a/docker-compose/docker-compose-no-build-no-db-container.yml +++ b/docker-compose/docker-compose-no-build-no-db-container.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -13,16 +13,16 @@ services: pull_policy: always restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_VARIANT: 'geth' - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false + ETHEREUM_JSONRPC_VARIANT: "geth" + ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ + DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4472d2ef4b82..5a374526160f 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: redis_db: @@ -31,20 +31,20 @@ services: RELEASE_VERSION: 5.2.3 restart: always stop_grace_period: 5m - container_name: 'backend' + container_name: "backend" links: - db:database command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ./envs/common-blockscout.env + - ./envs/common-blockscout.env environment: - ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ - ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/ - DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false - CHAIN_ID: '1337' + ETHEREUM_JSONRPC_HTTP_URL: https://nova.gemini-3g.subspace.network/ws + ETHEREUM_JSONRPC_TRACE_URL: https://nova.gemini-3g.subspace.network/ws + ETHEREUM_JSONRPC_WS_URL: wss://nova.gemini-3g.subspace.network/ws + DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false + CHAIN_ID: "1002" volumes: - ./logs/:/app/logs/ diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index 4079cbb48bc9..304905d0ae33 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -1,14 +1,14 @@ # DOCKER_TAG= ETHEREUM_JSONRPC_VARIANT=ganache -ETHEREUM_JSONRPC_HTTP_URL=https://domain-3.evm.gemini-3f.subspace.network +ETHEREUM_JSONRPC_HTTP_URL=https://nova.gemini-3g.subspace.network/ws # ETHEREUM_JSONRPC_FALLBACK_HTTP_URL= DATABASE_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false -ETHEREUM_JSONRPC_TRACE_URL=https://domain-3.evm.gemini-3f.subspace.network -ETHEREUM_JSONRPC_WS_URL=wss://domain-3.evm.gemini-3f.subspace.network/ws +ETHEREUM_JSONRPC_TRACE_URL=https://nova.gemini-3g.subspace.network/ws +ETHEREUM_JSONRPC_WS_URL=wss://nova.gemini-3g.subspace.network/ws # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL= ETHEREUM_JSONRPC_HTTP_TIMEOUT=90 NETWORK=Subspace -SUBNETWORK=Gemini 3f +SUBNETWORK=Gemini 3g LOGO=/images/blockscout_logo.svg # ETHEREUM_JSONRPC_WS_URL= ETHEREUM_JSONRPC_TRANSPORT=http diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env index 8b5eb8332c12..d859079d797d 100644 --- a/docker-compose/envs/common-frontend.env +++ b/docker-compose/envs/common-frontend.env @@ -1,15 +1,15 @@ -NEXT_PUBLIC_API_HOST=blockscout.subspace.network +NEXT_PUBLIC_API_HOST=nova.subspace.network NEXT_PUBLIC_API_PROTOCOL=https NEXT_PUBLIC_STATS_API_HOST=http://localhost:8080 -NEXT_PUBLIC_NETWORK_NAME=Gemini 3f -NEXT_PUBLIC_NETWORK_SHORT_NAME=Gemini 3f +NEXT_PUBLIC_NETWORK_NAME=Gemini 3g +NEXT_PUBLIC_NETWORK_SHORT_NAME=Gemini 3g NEXT_PUBLIC_NETWORK_ID=1002 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Subspace NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=TSSC NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18 NEXT_PUBLIC_API_BASE_PATH=/ NEXT_PUBLIC_FEATURED_NETWORKS= -NEXT_PUBLIC_APP_HOST=blockscout.subspace.network +NEXT_PUBLIC_APP_HOST=nova.subspace.network NEXT_PUBLIC_APP_PROTOCOL=https NEXT_PUBLIC_HOMEPAGE_CHARTS=['daily_txs'] NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081 @@ -22,4 +22,4 @@ NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL=wss NEXT_PUBLIC_WEB3_WALLETS=['metamask'] NEXT_PUBLIC_WEB3_DISABLE_ADD_TOKEN_TO_WALLET=false NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=b989b4df40c7db4da07ff951dd48cac6 -NEXT_PUBLIC_NETWORK_RPC_URL=https://domain-0.evm.gemini-3f.subspace.network \ No newline at end of file +NEXT_PUBLIC_NETWORK_RPC_URL=https://nova.gemini-3g.subspace.network/ws diff --git a/docker-compose/proxy/backend.conf b/docker-compose/proxy/backend.conf index 45a41da1d6aa..33fc2c72ddba 100644 --- a/docker-compose/proxy/backend.conf +++ b/docker-compose/proxy/backend.conf @@ -8,7 +8,7 @@ server { root /var/www/html; index index.html index.htm index.nginx-debian.html; - server_name blockscout.subspace.network; + server_name nova.subspace.network; location / { proxy_buffering off; @@ -23,20 +23,20 @@ server { } listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/blockscout.subspace.network/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/blockscout.subspace.network/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/nova.subspace.network/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/nova.subspace.network/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot } server { - if ($host = blockscout.subspace.network) { + if ($host = nova.subspace.network) { return 301 https://$host$request_uri; } # managed by Certbot - server_name blockscout.subspace.network; + server_name nova.subspace.network; listen 80; return 404; # managed by Certbot diff --git a/docker-compose/proxy/nginx.conf b/docker-compose/proxy/nginx.conf index a27510d4fd27..58aadc77197d 100644 --- a/docker-compose/proxy/nginx.conf +++ b/docker-compose/proxy/nginx.conf @@ -76,7 +76,7 @@ http { # Logging Settings ## - log_format compression '$remote_addr - [$time_local] ' '"$request" $status $body_bytes_sent ' '"$http_referer" "$http_user_agent" "$gzip_ratio"'; + log_format compression '$remote_addr - [$time_local] \$request $status $body_bytes_sent \$http_referer \$http_user_agent \$gzip_ratio'; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; diff --git a/docker-compose/services/docker-compose-certbot.yml b/docker-compose/services/docker-compose-certbot.yml index bdbae41e3553..91f087239441 100644 --- a/docker-compose/services/docker-compose-certbot.yml +++ b/docker-compose/services/docker-compose-certbot.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: certbot: diff --git a/docker-compose/services/docker-compose-db.yml b/docker-compose/services/docker-compose-db.yml new file mode 100644 index 000000000000..cd8c2cc767c0 --- /dev/null +++ b/docker-compose/services/docker-compose-db.yml @@ -0,0 +1,16 @@ +version: "3.9" + +services: + db: + image: postgres:16 + restart: always + container_name: "postgres" + command: postgres -c 'max_connections=200' + environment: + POSTGRES_PASSWORD: "" + POSTGRES_USER: "postgres" + POSTGRES_HOST_AUTH_METHOD: "trust" + ports: + - 7432:5432 + volumes: + - ./blockscout-db-data:/var/lib/postgresql/data/ diff --git a/docker-compose/services/docker-compose-frontend.yml b/docker-compose/services/docker-compose-frontend.yml index 1f23c018460b..6900dd8647cd 100644 --- a/docker-compose/services/docker-compose-frontend.yml +++ b/docker-compose/services/docker-compose-frontend.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: frontend: @@ -6,6 +6,6 @@ services: pull_policy: always platform: linux/amd64 restart: always - container_name: 'frontend' + container_name: "frontend" env_file: - - ../envs/common-frontend.env + - ../envs/common-frontend.env diff --git a/docker-compose/services/docker-compose-nginx.yml b/docker-compose/services/docker-compose-nginx.yml index 13c1bef956cd..45a83f2f60c0 100644 --- a/docker-compose/services/docker-compose-nginx.yml +++ b/docker-compose/services/docker-compose-nginx.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: proxy: diff --git a/docker-compose/services/docker-compose-redis.yml b/docker-compose/services/docker-compose-redis.yml index c4b425509dea..b27a43d63582 100644 --- a/docker-compose/services/docker-compose-redis.yml +++ b/docker-compose/services/docker-compose-redis.yml @@ -1,8 +1,8 @@ -version: '3.8' +version: "3.9" services: redis_db: - image: 'redis:alpine' + image: "redis:alpine" container_name: redis_db command: redis-server volumes: diff --git a/docker-compose/services/docker-compose-sig-provider.yml b/docker-compose/services/docker-compose-sig-provider.yml index df508404f752..91e99c95e68d 100644 --- a/docker-compose/services/docker-compose-sig-provider.yml +++ b/docker-compose/services/docker-compose-sig-provider.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: sig-provider: @@ -6,4 +6,4 @@ services: pull_policy: always platform: linux/amd64 restart: always - container_name: 'sig-provider' + container_name: "sig-provider" diff --git a/docker-compose/services/docker-compose-smart-contract-verifier.yml b/docker-compose/services/docker-compose-smart-contract-verifier.yml index baa98f2157a7..3dcd57d6aae7 100644 --- a/docker-compose/services/docker-compose-smart-contract-verifier.yml +++ b/docker-compose/services/docker-compose-smart-contract-verifier.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: smart-contract-verifier: @@ -6,6 +6,6 @@ services: pull_policy: always platform: linux/amd64 restart: always - container_name: 'smart-contract-verifier' + container_name: "smart-contract-verifier" env_file: - - ../envs/common-smart-contract-verifier.env + - ../envs/common-smart-contract-verifier.env diff --git a/docker-compose/services/docker-compose-stats.yml b/docker-compose/services/docker-compose-stats.yml index 5dde5bbad13b..aefd79e3a874 100644 --- a/docker-compose/services/docker-compose-stats.yml +++ b/docker-compose/services/docker-compose-stats.yml @@ -1,15 +1,15 @@ -version: '3.8' +version: "3.9" services: stats-db: image: postgres:14 restart: always - container_name: 'stats-postgres' + container_name: "stats-postgres" command: postgres -c 'max_connections=200' environment: - POSTGRES_PASSWORD: '' - POSTGRES_USER: 'postgres' - POSTGRES_HOST_AUTH_METHOD: 'trust' + POSTGRES_PASSWORD: "" + POSTGRES_USER: "postgres" + POSTGRES_HOST_AUTH_METHOD: "trust" ports: - 7433:5432 volumes: @@ -20,11 +20,11 @@ services: pull_policy: always platform: linux/amd64 restart: always - container_name: 'stats' + container_name: "stats" extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" env_file: - - ../envs/common-stats.env + - ../envs/common-stats.env environment: - STATS__DB_URL=postgres://postgres:@stats-db:5432/stats - STATS__BLOCKSCOUT_DB_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false diff --git a/docker-compose/services/docker-compose-visualizer.yml b/docker-compose/services/docker-compose-visualizer.yml index 39dbfaf440e9..0ea4a978e257 100644 --- a/docker-compose/services/docker-compose-visualizer.yml +++ b/docker-compose/services/docker-compose-visualizer.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.9" services: visualizer: @@ -6,6 +6,6 @@ services: pull_policy: always platform: linux/amd64 restart: always - container_name: 'visualizer' + container_name: "visualizer" env_file: - - ../envs/common-visualizer.env + - ../envs/common-visualizer.env From 687d7249e66aacf514a88241d51b6cb990d415de Mon Sep 17 00:00:00 2001 From: DaMandal0rian Date: Tue, 7 Nov 2023 17:14:32 +0300 Subject: [PATCH 2/2] change name on frontend --- docker-compose/.env | 1 - docker-compose/envs/common-frontend.env | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 docker-compose/.env diff --git a/docker-compose/.env b/docker-compose/.env deleted file mode 100644 index a3545c93d7ae..000000000000 --- a/docker-compose/.env +++ /dev/null @@ -1 +0,0 @@ -NR_API_KEY=35c1132c5fc89dec5a8069ec55407aa2FFFFNRAL diff --git a/docker-compose/envs/common-frontend.env b/docker-compose/envs/common-frontend.env index d859079d797d..acb9bf357417 100644 --- a/docker-compose/envs/common-frontend.env +++ b/docker-compose/envs/common-frontend.env @@ -1,8 +1,8 @@ NEXT_PUBLIC_API_HOST=nova.subspace.network NEXT_PUBLIC_API_PROTOCOL=https NEXT_PUBLIC_STATS_API_HOST=http://localhost:8080 -NEXT_PUBLIC_NETWORK_NAME=Gemini 3g -NEXT_PUBLIC_NETWORK_SHORT_NAME=Gemini 3g +NEXT_PUBLIC_NETWORK_NAME=Gemini 3g Nova +NEXT_PUBLIC_NETWORK_SHORT_NAME=Gemini 3g Nova NEXT_PUBLIC_NETWORK_ID=1002 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Subspace NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=TSSC