From e70e90d37a3c6033bab101e2d74db669085a3d1e Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 5 Feb 2024 16:49:52 +0000 Subject: [PATCH 1/2] Remove network-ui submodule, update readme --- .gitmodules | 4 ---- README.md | 14 ++++---------- docker-compose.yml | 12 ------------ helper-scripts | 2 +- network-ui | 1 - scripts/run_proxy.sh | 14 ++++---------- 6 files changed, 9 insertions(+), 38 deletions(-) delete mode 160000 network-ui diff --git a/.gitmodules b/.gitmodules index 6713acc..d54a208 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = helper-scripts url = https://github.com/skalenetwork/helper-scripts.git branch = develop -[submodule "network-ui"] - path = network-ui - url = https://github.com/skalenetwork/network-ui.git - branch = develop diff --git a/README.md b/README.md index 1562de8..99535c1 100644 --- a/README.md +++ b/README.md @@ -16,19 +16,13 @@ JSON-RPC endpoints for SKALE chains. It is based on NGINX. 1. Clone repo & all submodules 2. Put `abi.json`, `server.crt` and `server.key`files in `data` folder -3. Export all required environement variables (see below) +3. Export all required environment variables (see below) 4. Run `scripts/run_proxy.sh` -#### Required environement variables +#### Required environment variables -- `NETWORKS` -- `DOCS_WEBSITE_URL` -- `MAIN_WEBSITE_URL` -- `NETWORK_NAME` -- `CHAIN_ID` -- `EXPLORER_URL` -- `BASE_PROXY_URL` -- `ETH_ENDPOINT` +- `ENDPOINT` - endpoint of the Ethereum network where `skale-manager` contracts are deployed +- `SERVER_NAME` - domain name of the server ## License diff --git a/docker-compose.yml b/docker-compose.yml index ac9e027..b03b45a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,5 @@ version: '3' services: - network-ui: - image: network-ui:latest - container_name: network_ui - network_mode: host - build: - context: ./network-ui - dockerfile: Dockerfile - logging: - driver: "json-file" - options: - max-file: "5" - max-size: "200m" skale-proxy: environment: SERVER_NAME: ${SERVER_NAME} diff --git a/helper-scripts b/helper-scripts index c253fa6..2541831 160000 --- a/helper-scripts +++ b/helper-scripts @@ -1 +1 @@ -Subproject commit c253fa60f1862753e0546dd9ade72b41e425cf99 +Subproject commit 2541831d3a8bf6691d994f37f379ac36d760c0a4 diff --git a/network-ui b/network-ui deleted file mode 160000 index 793746a..0000000 --- a/network-ui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 793746a0390fc2fe7046e72dedf2d9f652bdd37b diff --git a/scripts/run_proxy.sh b/scripts/run_proxy.sh index e565b6c..8fe18dc 100644 --- a/scripts/run_proxy.sh +++ b/scripts/run_proxy.sh @@ -1,17 +1,11 @@ #!/bin/bash -export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +set -e -export NETWORKS=$NETWORKS -export DOCS_WEBSITE_URL=$DOCS_WEBSITE_URL -export MAIN_WEBSITE_URL=$MAIN_WEBSITE_URL -export NETWORK_NAME=$NETWORK_NAME -export CHAIN_ID=$CHAIN_ID -export EXPLORER_URL=$EXPLORER_URL -export BASE_PROXY_URL=$BASE_PROXY_URL -export ABIS_URL=$ABIS_URL +export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -bash $DIR/../network-ui/prepare_env_file.sh +: "${ENDPOINT?Need to set ENDPOINT}" +: "${MANAGER_TAG?Need to set MANAGER_TAG}" cd $DIR/.. docker-compose up --build -d \ No newline at end of file From f103985c19dc10717fc5a4e9f5732cf4a2b69872 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 5 Feb 2024 16:54:52 +0000 Subject: [PATCH 2/2] Remove network-ui submodule, update readme --- scripts/run_proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_proxy.sh b/scripts/run_proxy.sh index 8fe18dc..394b6ea 100644 --- a/scripts/run_proxy.sh +++ b/scripts/run_proxy.sh @@ -5,7 +5,7 @@ set -e export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" : "${ENDPOINT?Need to set ENDPOINT}" -: "${MANAGER_TAG?Need to set MANAGER_TAG}" +: "${SERVER_NAME?Need to set SERVER_NAME}" cd $DIR/.. docker-compose up --build -d \ No newline at end of file