diff --git a/build-ui/Dockerfile b/build-ui/Dockerfile new file mode 100644 index 0000000..0ceae85 --- /dev/null +++ b/build-ui/Dockerfile @@ -0,0 +1,20 @@ +FROM node:15.14-alpine AS build + +WORKDIR /usr/src/app + +RUN apk add git && \ + git clone https://github.com/ethersphere/bee-dashboard.git . && \ + npm ci && \ + npm run build + +FROM node:15.14-alpine AS final + +RUN npm i -g serve + +WORKDIR /app + +COPY --from=build /usr/src/app/build . + +EXPOSE 8080 + +ENTRYPOINT ["serve","-l","8080"] \ No newline at end of file diff --git a/build/config.yml b/build/config.yml index 8061431..122231d 100644 --- a/build/config.yml +++ b/build/config.yml @@ -4,7 +4,7 @@ # HTTP API listen address (default ":1633") api-addr: :1633 # initial nodes to connect to (default [/dnsaddr/bootnode.ethswarm.org]) -bootnode: [/dnsaddr/bootnode.ethswarm.org] +bootnode: [/dnsaddr/testnet.ethswarm.org] # cause the node to always accept incoming connections bootnode-mode: false # enable clef signer @@ -14,7 +14,7 @@ clef-signer-endpoint: "" # config file (default is /home//.bee.yaml) config: /home/bee/.bee.yaml # origins with CORS headers enabled -cors-allowed-origins: [] +cors-allowed-origins: ["*"] # data directory (default "/home//.bee") data-dir: /home/bee/.bee # db capacity in chunks, multiply by 4096 to get approximate capacity in bytes @@ -38,7 +38,7 @@ global-pinning-enable: false # NAT exposed address nat-addr: "" # ID of the Swarm network (default 1) -network-id: 1 +network-id: 10 # P2P listen address (default ":1634") p2p-addr: :1634 # enable P2P QUIC protocol @@ -49,12 +49,12 @@ p2p-ws-enable: false password: "" # path to a file that contains password for decrypting keys password-file: "/home/bee/.password" -# amount in BZZ below the peers payment threshold when we initiate settlement (default 1000000000000) -payment-early: 1000000000000 -# threshold in BZZ where you expect to get paid from your peers (default 10000000000000) -payment-threshold: 10000000000000 -# excess debt above payment threshold in BZZ where you disconnect from your peer (default 50000000000000) -payment-tolerance: 50000000000000 +# amount in BZZ below the peers payment threshold when we initiate settlement (default 10000000) +payment-early: 10000000 +# threshold in BZZ where you expect to get paid from your peers (default 100000000) +payment-threshold: 100000000 +# excess debt above payment threshold in BZZ where you disconnect from your peer (default 100000000) +payment-tolerance: 100000000 # ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url resolver-options: [] # whether we want the node to start with no listen addresses for p2p @@ -65,8 +65,8 @@ swap-enable: true swap-endpoint: http://localhost:8545 # swap factory address swap-factory-address: "" -# initial deposit if deploying a new chequebook (default 100000000000000000) -swap-initial-deposit: 100000000000000000 +# initial deposit if deploying a new chequebook (default 10000000000000000) +swap-initial-deposit: 10000000000000000 # enable tracing tracing-enable: false # endpoint to send tracing data (default "127.0.0.1:6831") @@ -76,4 +76,4 @@ tracing-service-name: bee # log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace (default "info") verbosity: info # send a welcome message string during handshakes -welcome-message: "" \ No newline at end of file +welcome-message: "" diff --git a/dappnode_package.json b/dappnode_package.json index 9e5bbea..22ea055 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,20 +1,24 @@ + { "name": "bee.dnp.dappnode.eth", "version": "0.1.5", - "upstreamVersion": "v0.6.2", + "upstreamVersion": "v1.0.0", "shortDescription": "Storage and communication infrastructure for a sovereign digital society", "description": "[Swarm](https://swarm.ethereum.org/) is a distributed storage platform and content distribution service, a native base layer service of the ethereum web3 stack. The primary objective of Swarm is to provide a decentralized and redundant store for dapp code and data as well as block chain and state data. Swarm is also set out to provide various base layer services for web3, including node-to-node messaging, media streaming, decentralized database services and scalable state-channel infrastructure for decentralized service economies. \n\n\n Learn about all you can do today with Swarm in the [Swarm documentation](https://docs.ethswarm.org/).", "type": "library", "architectures": ["linux/amd64", "linux/arm64"], "author": "DAppNode Association (https://github.com/dappnode)", "contributors": [ - "Eduardo Antuña (https://github.com/eduadiez)" + "Eduardo Antuña (https://github.com/eduadiez)", + "Tropicar (https://github.com/tropicar)" ], + "upstreamRepo": "ethersphere/bee", "upstreamArg": "UPSTREAM_VERSION", "categories": ["Storage", "Communications"], "links": { - "api": "http://bee.dappnode:1635/" + "Bee Dashboard": "http://dashboard.bee.dappnode:8080/", + "DEBUG API": "http://bee.dappnode:1635/peers" }, "requirements": { "minimumDappnodeVersion": "0.2.29" @@ -27,6 +31,7 @@ "url": "https://github.com/dappnode/DAppNodePackage-bee/issues" }, "license": "GPL-3.0", + "mainService": "bee.dnp.dappnode.eth", "backup": [ { "name": "keys", diff --git a/docker-compose.yml b/docker-compose.yml index 9faae47..f247b0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ version: "3.4" services: bee.dnp.dappnode.eth: - image: "bee.dnp.dappnode.eth:0.1.6" + image: "bee.dnp.dappnode.eth:0.1.5" build: context: ./build args: - UPSTREAM_VERSION: v0.6.2 + UPSTREAM_VERSION: v1.0.0 ports: - "1634:1634" volumes: @@ -16,6 +16,12 @@ services: - EXTRA_OPTS - BEE_DB_CAPACITY=5000000 - BEE_WELCOME_MESSAGE=Hello from my DAppNode! + - FULL-NODE-MODE=--full-node + restart: unless-stopped + dashboard: + build: + context: ./build-ui + image: "dashboard.bee.dnp.dappnode.eth:0.1.5" restart: unless-stopped volumes: bee: {} diff --git a/getting-started.md b/getting-started.md index 4675b15..51d272c 100644 --- a/getting-started.md +++ b/getting-started.md @@ -10,5 +10,15 @@ time="2020-12-06T14:57:46Z" level=warning msg="on goerli you can get both goerli you need to go to the link that appears on the logs https://faucet.ethswarm.org?address=770b135b11148830a7f918067f134a011e658d3c to get some goerli eth and goerli bzz for your account (`770b135b11148830a7f918067f134a011e658d3c` in this example) +To get more info about swarm go to: [swarm docs](https://docs.ethswarm.org/) -To get more info about swarm go to: [swarm docs](https://docs.ethswarm.org/) \ No newline at end of file +### Bee Dashboard + +It's a UI that let you work with your node easily. You can access it by clicking the link below or [here](http://dashboard.bee.dappnode:8080). + +In **Status** tab, in the Node Setup: + +- Connected to Node DebugAPI: you should change the endpoint for the URL http://bee.dappnode:1635 instead http://localhost:1635 . +- Connected to Node API: you should change the endpoint for the URL http://bee.dappnode:1633 instead http://localhost:1633 + +If you have questions about bee in DAppNode I recommend you to ask in the channel #bee of the DAppNode discord. In case the doubts are about bee, we recommend asking in the bee discord channel. diff --git a/setup-wizard.yml b/setup-wizard.yml index 998abf4..49c4e50 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -33,4 +33,10 @@ fields: type: allNamedVolumesMountpoint title: Storage data mountpoint description: >- - Use this option if you want to store the Storage data in a separate drive. Make sure to have sufficient free space \ No newline at end of file + Use this option if you want to store the Storage data in a separate drive. Make sure to have sufficient free space + - title: Full Node Mode + id: full-node + description: Enable the full node mode, if you remove this field, you will run the node in light mode, you can obtain more info about it in bee documentation https://docs.ethswarm.org/docs/access-the-swarm/light-nodes + target: + type: environment + name: FULL-NODE-MODE