diff --git a/deployment/compose.run.yml b/deployment/compose.run.yml index 6783b740c..8d2fbbe1e 100644 --- a/deployment/compose.run.yml +++ b/deployment/compose.run.yml @@ -1,7 +1,7 @@ version: '3.8' include: - - compose.tracing.yml + - ./deployment/compose.tracing.yml services: @@ -20,24 +20,12 @@ services: ports: - "13800:8000/tcp" - cfgsync: - container_name: cfgsync - image: ghcr.io/logos-blockchain/logos-blockchain:${TOOLS_IMAGE_LABEL} - volumes: - - node-data:/node-data - - .:/etc/logos-blockchain - depends_on: - - grafana - ports: - - "4400:4400/tcp" - entrypoint: /etc/logos-blockchain/scripts/run_cfgsync_server.sh - faucet: container_name: faucet image: ghcr.io/logos-blockchain/logos-blockchain:${TOOLS_IMAGE_LABEL} volumes: - node-data:/node-data - - .:/etc/logos-blockchain + - ./deployment:/etc/logos-blockchain environment: - FAUCET_PORT=18090 - NODE_API_ADDR=http://logos_blockchain_node_0:${NODE0_API_PORT} @@ -48,9 +36,7 @@ services: image: ghcr.io/logos-blockchain/logos-blockchain-node:${NODE_IMAGE_LABEL} volumes: - node-data:/node-data - - .:/etc/logos-blockchain - depends_on: - - cfgsync + - ./deployment:/etc/logos-blockchain environment: - LB_HOST_IDX=0 - CFG_HOST_IP=${PUBLIC_IP_ADDR} @@ -72,9 +58,7 @@ services: image: ghcr.io/logos-blockchain/logos-blockchain-node:${NODE_IMAGE_LABEL} volumes: - node-data:/node-data - - .:/etc/logos-blockchain - depends_on: - - cfgsync + - ./deployment:/etc/logos-blockchain environment: - LB_HOST_IDX=1 - CFG_HOST_IP=${PUBLIC_IP_ADDR} @@ -96,9 +80,7 @@ services: image: ghcr.io/logos-blockchain/logos-blockchain-node:${NODE_IMAGE_LABEL} volumes: - node-data:/node-data - - .:/etc/logos-blockchain - depends_on: - - cfgsync + - ./deployment:/etc/logos-blockchain environment: - LB_HOST_IDX=2 - CFG_HOST_IP=${PUBLIC_IP_ADDR} @@ -120,9 +102,7 @@ services: image: ghcr.io/logos-blockchain/logos-blockchain-node:${NODE_IMAGE_LABEL} volumes: - node-data:/node-data - - .:/etc/logos-blockchain - depends_on: - - cfgsync + - ./deployment:/etc/logos-blockchain environment: - LB_HOST_IDX=3 - CFG_HOST_IP=${PUBLIC_IP_ADDR} @@ -143,8 +123,12 @@ services: container_name: filebrowser image: filebrowser/filebrowser:v2-s6 volumes: + - ./deployment/tracing/filebrowser.json:/config/settings.json - node-data:/srv - command: ["--noauth", "-b", "/filebrowser"] + environment: + - FB_ADDRESS=0.0.0.0 + - PUID=0 + - PGID=0 restart: on-failure nginx: @@ -154,16 +138,15 @@ services: - "13000:13000" - "13001:13001" depends_on: - - cfgsync - explorer - faucet environment: - ENV_TITLE_STRING=${ENV_TITLE_STRING} volumes: - node-data:/node-data - - ./nginx/run.conf:/etc/nginx/nginx.conf - - ./nginx/static/run:/usr/share/nginx/html_template - - ./scripts/run_nginx.sh:/etc/run_nginx.sh + - ./deployment/nginx/run.conf:/etc/nginx/nginx.conf + - ./deployment/nginx/static/run:/usr/share/nginx/html_template + - ./deployment/scripts/run_nginx.sh:/etc/run_nginx.sh entrypoint: /etc/run_nginx.sh # L2 Sequencer Demo Services diff --git a/deployment/compose.setup.yml b/deployment/compose.setup.yml index 5785391cf..c5aff61df 100644 --- a/deployment/compose.setup.yml +++ b/deployment/compose.setup.yml @@ -2,15 +2,13 @@ version: '3.8' services: - cfgsync: - container_name: cfgsync + setup: + container_name: setup image: ghcr.io/logos-blockchain/logos-blockchain:${TOOLS_IMAGE_LABEL} volumes: - node-data:/node-data - - ../nodes/node/binary/src/config/deployment/settings.yaml:/deployment.yaml - - .:/etc/logos-blockchain - ports: - - "4400:4400/tcp" + - ./nodes/node/binary/src/config/deployment/settings.yaml:/deployment.yaml + - ./deployment:/etc/logos-blockchain entrypoint: /etc/logos-blockchain/scripts/cleanup_node_data.sh nginx: @@ -20,14 +18,14 @@ services: - "13000:13000" - "13001:13001" depends_on: - - cfgsync + - setup environment: - ENV_TITLE_STRING=${ENV_TITLE_STRING} volumes: - node-data:/node-data - - ./nginx/setup.conf:/etc/nginx/nginx.conf - - ./nginx/static/setup:/usr/share/nginx/html_template - - ./scripts/setup_nginx.sh:/etc/setup_nginx.sh + - ./deployment/nginx/setup.conf:/etc/nginx/nginx.conf + - ./deployment/nginx/static/setup:/usr/share/nginx/html_template + - ./deployment/scripts/setup_nginx.sh:/etc/setup_nginx.sh entrypoint: /etc/setup_nginx.sh volumes: diff --git a/deployment/nginx/run.conf b/deployment/nginx/run.conf index 5f4e6e538..5afa638c9 100644 --- a/deployment/nginx/run.conf +++ b/deployment/nginx/run.conf @@ -19,14 +19,6 @@ http { listen 13000; server_name _; - # CFGSYNC API (Proxy to the internal Docker service). - location /cfgsync/ { - proxy_pass http://cfgsync:4400/; - proxy_http_version 1.1; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - } - # Block Explorer location /explorer/ { rewrite ^/explorer/(.*)$ /web/explorer/$1 break; @@ -49,12 +41,12 @@ http { } # Otlp http collector for external nodes. - location /otlp { + location /otlp/ { if ($is_otlp_authorized = 0) { return 401 '{"error": "Unauthorized"}\n'; } - proxy_pass http://otel:4318/v1/metrics; + proxy_pass http://otel:4318/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -78,10 +70,19 @@ http { # Filebrowser Web UI location /filebrowser/ { - proxy_pass http://filebrowser:80; + proxy_pass http://filebrowser:80/; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_cache off; + proxy_buffering off; + proxy_read_timeout 86400s; + client_max_body_size 0; } # Expose all nodes data on https://$EVN_TITLE_STRING.blockchain.logos.co/internal/node-data/. diff --git a/deployment/scripts/cleanup_node_data.sh b/deployment/scripts/cleanup_node_data.sh index 06ee84c89..4b84be7af 100755 --- a/deployment/scripts/cleanup_node_data.sh +++ b/deployment/scripts/cleanup_node_data.sh @@ -9,4 +9,4 @@ set -e mkdir /node-data/explorer mkdir /node-data/cfgsync -cp /deployment.yaml /node-data/cfgsync/deployment-settings.yaml +cp /deployment.yaml /node-data/deployment.yaml diff --git a/deployment/scripts/run_faucet.sh b/deployment/scripts/run_faucet.sh index 47890aaf1..bbdf0135f 100755 --- a/deployment/scripts/run_faucet.sh +++ b/deployment/scripts/run_faucet.sh @@ -2,7 +2,7 @@ set -e -export CFG_DEPLOYMENT_PATH="/node-data/cfgsync/deployment-settings.yaml" +export CFG_DEPLOYMENT_PATH="/node-data/deployment.yaml" /usr/bin/logos-blockchain-faucet \ --port $FAUCET_PORT \ diff --git a/deployment/scripts/run_node.sh b/deployment/scripts/run_node.sh index dd3acbe27..57a554fd8 100755 --- a/deployment/scripts/run_node.sh +++ b/deployment/scripts/run_node.sh @@ -5,7 +5,7 @@ set -e export CFG_FILE_PATH="/node-data/${LB_HOST_IDX}/user_config.yaml" \ CFG_SERVER_ADDR="http://cfgsync:4400" \ CFG_HOST_IDENTIFIER="i-${LB_HOST_IDX}" \ - CFG_DEPLOYMENT_PATH="/node-data/cfgsync/deployment-settings.yaml" \ + CFG_DEPLOYMENT_PATH="/node-data/deployment.yaml" \ LOG_BACKEND="file" \ LOG_DIR="/node-data/${LB_HOST_IDX}/" diff --git a/deployment/tracing/filebrowser.json b/deployment/tracing/filebrowser.json new file mode 100644 index 000000000..90917f515 --- /dev/null +++ b/deployment/tracing/filebrowser.json @@ -0,0 +1,9 @@ +{ + "port": 80, + "baseURL": "/internal/filebrowser/", + "address": "", + "noAuth": true, + "log": "stdout", + "database": "/database/filebrowser.db", + "root": "/srv" +}