Merge pull request #8100 from blockscout/vb-extend-docker-compose-proxy

Extend docker-compose configs with new config when front is running externally
vb-fix-docker-compose-auth-path
Victor Baranov 1 year ago committed by GitHub
commit 1e2b7eba59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 83
      docker-compose/docker-compose-no-build-external-frontend.yml
  3. 4
      docker-compose/docker-compose-no-build-frontend.yml
  4. 1
      docker-compose/envs/common-stats.env
  5. 2
      docker-compose/proxy/default.conf.template
  6. 8
      docker-compose/services/docker-compose-nginx.yml
  7. 6
      docker-compose/services/docker-compose-stats.yml

@ -14,6 +14,8 @@
### Chore ### Chore
- [#8100](https://github.com/blockscout/blockscout/pull/8100) - Extend docker-compose configs with new config when front is running externally
<details> <details>
<summary>Dependencies version bumps</summary> <summary>Dependencies version bumps</summary>

@ -0,0 +1,83 @@
version: '3.8'
services:
redis_db:
extends:
file: ./services/docker-compose-redis.yml
service: redis_db
db:
extends:
file: ./services/docker-compose-db.yml
service: db
backend:
depends_on:
- db
- smart-contract-verifier
- redis_db
image: blockscout/blockscout:${DOCKER_TAG:-master}
pull_policy: always
restart: always
stop_grace_period: 5m
container_name: 'blockscout'
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'
env_file:
- ./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
ECTO_USE_SSL: 'false'
SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN'
CHAIN_ID: '1337'
API_V2_ENABLED: 'true'
MIX_ENV: 'prod'
ports:
- 4000:4000
volumes:
- ./logs/:/app/logs/
smart-contract-verifier:
extends:
file: ./services/docker-compose-smart-contract-verifier.yml
service: smart-contract-verifier
visualizer:
extends:
file: ./services/docker-compose-visualizer.yml
service: visualizer
sig-provider:
extends:
file: ./services/docker-compose-sig-provider.yml
service: sig-provider
stats-db:
depends_on:
- backend
extends:
file: ./services/docker-compose-stats.yml
service: stats-db
stats:
depends_on:
- stats-db
extends:
file: ./services/docker-compose-stats.yml
service: stats
proxy:
depends_on:
- backend
- stats
extends:
file: ./services/docker-compose-nginx.yml
service: proxy

@ -76,14 +76,16 @@ services:
stats: stats:
depends_on: depends_on:
- backend - stats-db
extends: extends:
file: ./services/docker-compose-stats.yml file: ./services/docker-compose-stats.yml
service: stats service: stats
proxy: proxy:
depends_on: depends_on:
- backend
- frontend - frontend
- stats
extends: extends:
file: ./services/docker-compose-nginx.yml file: ./services/docker-compose-nginx.yml
service: proxy service: proxy

@ -15,7 +15,6 @@ STATS__CREATE_DATABASE=false
STATS__RUN_MIGRATIONS=false STATS__RUN_MIGRATIONS=false
STATS__DEFAULT_SCHEDULE=0 0 1 * * * * STATS__DEFAULT_SCHEDULE=0 0 1 * * * *
STATS__FORCE_UPDATE_ON_START=false STATS__FORCE_UPDATE_ON_START=false
STATS__CHARTS_CONFIG=config/charts.toml
STATS__METRICS__ENABLED=false STATS__METRICS__ENABLED=false
STATS__METRICS__ADDR=0.0.0.0:6060 STATS__METRICS__ADDR=0.0.0.0:6060

@ -3,7 +3,7 @@ server {
server_name localhost; server_name localhost;
proxy_http_version 1.1; proxy_http_version 1.1;
location / { location / {
proxy_pass http://frontend:3000; proxy_pass ${FRONT_PROXY_PASS};
} }
location /socket/v2 { location /socket/v2 {
proxy_pass http://backend:4000; proxy_pass http://backend:4000;

@ -3,11 +3,11 @@ version: '3.8'
services: services:
proxy: proxy:
image: nginx image: nginx
container_name: proxy
volumes: volumes:
- type: bind - "../proxy:/etc/nginx/templates"
source: ../proxy/nginx.conf environment:
target: /etc/nginx/conf.d/default.conf FRONT_PROXY_PASS: ${FRONT_PROXY_PASS:-http://frontend:3000}
read_only: true
ports: ports:
- 80:80 - 80:80
- 81:81 - 81:81

@ -12,10 +12,10 @@ services:
POSTGRES_HOST_AUTH_METHOD: 'trust' POSTGRES_HOST_AUTH_METHOD: 'trust'
ports: ports:
- 7433:5432 - 7433:5432
volumes:
- ./stats-db-data:/var/lib/postgresql/data/
stats: stats:
depends_on:
- stats-db
image: ghcr.io/blockscout/stats:${STATS_DOCKER_TAG:-latest} image: ghcr.io/blockscout/stats:${STATS_DOCKER_TAG:-latest}
pull_policy: always pull_policy: always
platform: linux/amd64 platform: linux/amd64
@ -32,5 +32,3 @@ services:
- STATS__RUN_MIGRATIONS=true - STATS__RUN_MIGRATIONS=true
ports: ports:
- 8153:8050 - 8153:8050
volumes:
- ./stats-db-data:/var/lib/postgresql/data/

Loading…
Cancel
Save