From 9e75718da20021be3b6bffbe61f6dc2025467c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Antu=C3=B1a=20D=C3=ADez?= <20141918+eduadiez@users.noreply.github.com> Date: Thu, 19 Sep 2019 10:47:55 +0200 Subject: [PATCH 1/2] Advance manifest to new version: 0.1.1 --- dappnode_package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dappnode_package.json b/dappnode_package.json index c9ef3c1..f0baf90 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "vipnode.dnp.dappnode.eth", - "version": "0.1.0", + "version": "0.1.1", "upstreamVersion": "2.2.1", "shortDescription": "Economic incentive for running Ethereum full nodes", "description": "[Vipnode](https://vipnode.org)'s goal is to allow the Ethereum network to remain decentralized by creating a financial marketplace for more people to run full nodes and serve native light clients. Check this [medium article](https://medium.com/vipnode/an-economic-incentive-for-running-ethereum-full-nodes-ecc0c9ebe22) to understand the motivation behind this project and this [2.0 release article](https://medium.com/vipnode/vipnode-2-0-released-9af1d65b4552) for a tutorial on how to use Vipnode.", From dd2d00f37a0a9b934a98d2794202a183f361de41 Mon Sep 17 00:00:00 2001 From: vdo Date: Sat, 28 Dec 2019 15:43:43 +0100 Subject: [PATCH 2/2] 2.3.3 version, wizard --- build/Dockerfile | 4 ++-- dappnode_package.json | 23 ++++------------------- docker-compose.yml | 9 ++++++++- setup-target.json | 6 ++++++ setup-ui.json | 8 ++++++++ setup.schema.json | 15 +++++++++++++++ 6 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 setup-target.json create mode 100644 setup-ui.json create mode 100644 setup.schema.json diff --git a/build/Dockerfile b/build/Dockerfile index c7840dc..7f15c0e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,8 +1,8 @@ ### Build stage FROM golang:alpine3.9 AS build-env -ENV VERSION v2.2.1 +ENV VERSION v2.3.3 # Install build deps -RUN apk update && apk --no-cache add git gcc build-base +RUN apk update && apk --no-cache add git gcc build-base linux-headers # Get the source code RUN git clone -b ${VERSION} https://github.com/vipnode/vipnode.git diff --git a/dappnode_package.json b/dappnode_package.json index c9ef3c1..e1b7091 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,27 +1,12 @@ { "name": "vipnode.dnp.dappnode.eth", - "version": "0.1.0", - "upstreamVersion": "2.2.1", + "version": "0.1.1", + "upstreamVersion": "2.3.3", "shortDescription": "Economic incentive for running Ethereum full nodes", "description": "[Vipnode](https://vipnode.org)'s goal is to allow the Ethereum network to remain decentralized by creating a financial marketplace for more people to run full nodes and serve native light clients. Check this [medium article](https://medium.com/vipnode/an-economic-incentive-for-running-ethereum-full-nodes-ecc0c9ebe22) to understand the motivation behind this project and this [2.0 release article](https://medium.com/vipnode/vipnode-2-0-released-9af1d65b4552) for a tutorial on how to use Vipnode.", - "avatar": "/ipfs/QmSVNvnnq1Wg5aXT7fxWHQbLbR1aqccGUJsCWjNVT7qtFL", "type": "service", - "image": { - "path": "", - "hash": "", - "size": "", - "restart": "always", - "environment": [ - "PAYOUT_ADDRESS=" - ], - "external_vol": [ - "dncore_ethchaindnpdappnodeeth_identity:/app/identity:ro" - ] - }, "author": "DAppNode Association (https://github.com/dappnode)", - "categories": [ - "Economic incentive" - ], + "categories": ["Economic incentive"], "links": { "homepage": "https://github.com/dappnode/DAppNodePackage-vipnode" }, @@ -33,4 +18,4 @@ "url": "https://github.com/dappnode/DAppNodePackage-vipnode/issues" }, "license": "GPL-3.0" -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 5d9c5af..1a727ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,12 @@ version: '3.4' services: vipnode.dnp.dappnode.eth: - image: 'vipnode.dnp.dappnode.eth:0.1.0' + image: 'vipnode.dnp.dappnode.eth:0.1.1' build: ./build + environment: + - PAYOUT_ADDRESS= + volumes: + - 'dncore_ethchaindnpdappnodeeth_identity:/app/identity:ro' +volumes: + dncore_ethchaindnpdappnodeeth_identity: + external: true diff --git a/setup-target.json b/setup-target.json new file mode 100644 index 0000000..f4f807e --- /dev/null +++ b/setup-target.json @@ -0,0 +1,6 @@ +{ + "payoutAddress": { + "type": "environment", + "name": "PAYOUT_ADDRESS" + } +} diff --git a/setup-ui.json b/setup-ui.json new file mode 100644 index 0000000..9d69f8f --- /dev/null +++ b/setup-ui.json @@ -0,0 +1,8 @@ +{ + "ui:order": ["payoutAddress"], + "payoutAddress": { + "errorMessages": { + "pattern": "Must be a valid address (0x1fD16A...)" + } + } +} diff --git a/setup.schema.json b/setup.schema.json new file mode 100644 index 0000000..1e16fb4 --- /dev/null +++ b/setup.schema.json @@ -0,0 +1,15 @@ +{ + "description": "Welcome to DAppNode's Vipnode configuration!", + "type": "object", + "properties": { + "payoutAddress": { + "type": "string", + "title": "Payout Address", + "description": "Public address for the payment rewards of your node.", + "pattern": "^0x[a-fA-F0-9]{40}$", + "customErrors": { + "pattern": "Must be a valid address (0x1fD16A...)" + } + } + } +}