Docker timeout

.github/workflows/auto_check.yml

@@ -0,0 +1,41 @@
+name: Update DAppNode package
+
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '00 */4 * * *'
+jobs:
+  dappnodepackage-update:
+    name: Trigger the DAppNode Package update
+    runs-on: ubuntu-latest
+    env: 
+      DISPATCH_REPO: dappnode/DAppNodePackage-geth
+      UPSTREAM_REPO: ethereum/go-ethereum
+    steps:
+    - uses: actions/checkout@v2
+    - name: Get the tag
+      id: get_tag
+      run: |
+        UPSTREAM_TAG=$(curl https://api.github.com/repos/$UPSTREAM_REPO/tags | jq .[0].name | tr -d "\"" )
+        DNP_UPSTREAM=$(cat dappnode_package.json | jq .upstreamVersion | tr -d "\"" )
+        if [ $UPSTREAM_TAG != $DNP_UPSTREAM ];then
+            echo "::set-output name=trigger_update::true"
+        fi
+        echo ::set-output name=TAG::$UPSTREAM_TAG
+    - name: update UPSTREAM_VERSION and commit changes
+      if: steps.get_tag.outputs.trigger_update == 'true'
+      run: |
+        sed -i "s/        UPSTREAM_VERSION: .*/        UPSTREAM_VERSION: ${{ steps.get_tag.outputs.TAG }}/g" docker-compose.yml
+        sed -i "s/  \"upstreamVersion\": \".*\",/  \"upstreamVersion\": \"${{ steps.get_tag.outputs.TAG }}\",/g" dappnode_package.json
+        git config --global user.email "eduadiez@gmail.com"
+        git config --global user.name "Eduardo"
+        git commit -am "Github action bumped version to ${{ steps.get_tag.outputs.TAG }}"
+        git push
+    - name: Send dispatch event to the DAppNode Package repository
+      if: steps.get_tag.outputs.trigger_update == 'true'
+      run: |
+        curl -v -X POST -u "${{ secrets.PAT_GITHUB }}" \
+        -H "Accept: application/vnd.github.everest-preview+json" \
+        -H "Content-Type: application/json" \
+        --data '{"event_type":"new_release", "client_payload": { "tag":"${{ steps.get_tag.outputs.TAG }}"}}' \
+        https://api.github.com/repos/$DISPATCH_REPO/dispatches

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: "Main"
+on:
+  repository_dispatch:
+  pull_request:
+  push:
+    branches:
+      - "master"
+      - "v[0-9]+.[0-9]+.[0-9]+"
+    paths-ignore:
+      - "README.md"
+
+jobs:
+  build-test:
+    runs-on: ubuntu-16.04
+    name: Build test
+    if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
+    steps:
+      - uses: actions/checkout@v2
+      - run: docker-compose build
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+      - name: Publish
+        run: npx @dappnode/dappnodesdk publish patch --dappnode_team_preset --timeout 2h
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEVELOPER_ADDRESS: "0xf35960302a07022aba880dffaec2fdd64d5bf1c1"

.gitignore

@@ -1 +1,2 @@
 build_*
+.env

README.md

@@ -0,0 +1,69 @@
+# Geth DAppNode package
+
+[![DAppNodeStore Available](https://img.shields.io/badge/DAppNodeStore-Available-brightgreen.svg)](http://my.dappnode/#/installer/geth.dnp.dappnode.eth)
+
+
+[![Geth github](https://img.shields.io/badge/Geth-Github-blue.svg)](https://github.com/ethereum/go-ethereum)
+
+You can use this package without installing it in your DAppNode following these instructions:
+
+## Prerequisites
+
+- git
+
+   Install [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) commandline tool.
+
+- docker
+
+   Install [docker](https://docs.docker.com/engine/installation). The community edition (docker-ce) will work. In Linux make sure you grant permissions to the current user to use docker by adding current user to docker group, `sudo usermod -aG docker $USER`. Once you update the users group, exit from the current terminal and open a new one to make effect.
+
+- docker-compose
+
+   Install [docker-compose](https://docs.docker.com/compose/install)
+
+**Note**: Make sure you can run `git`, `docker ps`, `docker-compose` without any issue and without sudo command.
+
+
+## Buidling
+
+`docker-compose build`
+
+## Running
+
+### Start
+
+`docker-compose up -d`
+
+### View logs
+
+`docker-compose logs -f`
+
+### Stop
+
+`docker-compose down`
+
+## Extra options
+
+You can edit the `docker-compose.yml` and add extra options, such as:
+```
+ - EXTRA_OPTS=--wsapi db,eth,net,ssh,miner,web3,personal,admin,txpool
+```
+
+## Connect using web3js
+
+If the package is running and you're connected to your dappnode you can use:
+```
+var Web3 = require('web3');
+var web3 = new Web3('ws://my.geth.dappnode:8546')
+web3.eth.getBlockNumber().then(console.log)
+```
+In case you are running it locally:
+```
+var Web3 = require('web3');
+var web3 = new Web3('ws://127.0.0.1:8546')
+web3.eth.getBlockNumber().then(console.log)
+```
+
+## License
+
+This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details

build/Dockerfile

@@ -1,19 +1,18 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.11-alpine as builder
+FROM golang:1.15-alpine as builder
 
-WORKDIR /usr/src/app
+ARG UPSTREAM_VERSION
 
-RUN apk add --no-cache make gcc musl-dev linux-headers git jq
-
-ARG COMMIT=cfbb969da803d4cc92e1a64fc1b3c06db299b564
-
-RUN git clone https://github.com/ethereum/go-ethereum.git
-RUN cd go-ethereum && git checkout $COMMIT && make geth
+RUN apk add --no-cache make gcc musl-dev linux-headers git bash
 
+RUN git clone -b ${UPSTREAM_VERSION} https://github.com/ethereum/go-ethereum.git && \
+    cd go-ethereum && make geth
+
 # Pull Geth into a second stage deploy alpine container
 FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates
-COPY --from=builder /usr/src/app/go-ethereum/build/bin/geth /usr/local/bin/
 
-ENTRYPOINT geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 $EXTRA_OPTS
+COPY --from=builder /go/go-ethereum/build/bin/geth /usr/local/bin
+
+ENTRYPOINT geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --syncmode ${SYNCMODE:-fast} --metrics --metrics.addr 0.0.0.0 $EXTRA_OPTS

dappnode_package.json

@@ -1,30 +1,34 @@
 {
-  "name": "ethchain-geth.public.dappnode.eth",
-  "version": "0.0.3",
-  "description": "Mainnet Geth",
-  "avatar": "/ipfs/QmTfnrUdZWaMgr2Zi1h1Z7zS5CbYtQZRs72yqKZQHj5fxT",
+  "name": "geth.dnp.dappnode.eth",
+  "version": "0.1.9",
+  "upstreamVersion": "v1.9.23",
+  "shortDescription": "Geth is the official Go implementation of the Ethereum protocol.",
+  "description": "Ethereum is a global, open-source platform for decentralized applications where you can write code that controls digital value, runs exactly as programmed, and is accessible anywhere in the world.",
   "type": "library",
+  "architectures": [
+    "linux/amd64",
+    "linux/arm64"
+  ],
   "chain": "ethereum",
-  "image": {
-    "path": "ethchain-geth.public.dappnode.eth_0.0.3.tar.xz",
-    "hash": "/ipfs/QmdQF3arvXiEkJ8DSR1auzCqxyhpmv1fGL1acTBQYyZvfr",
-    "size": 16184810,
-    "restart": "always",
-    "ports": [
-      "61313:30303",
-      "61313:30303/udp",
-      "61314:30304"
-    ],
-    "volumes": [
-      "ethchain-geth:/root/.ethereum/ethchain-geth"
-    ],
-    "environment": [
-      "EXTRA_OPTS=--rpcapi eth,net,web3,txpool"
-    ]
-  },
-  "author": "nanexcool",
+  "dockerTimeout": "20min",
+  "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
+  "contributors": [
+    "Mariano Conti (nanexcool) (hhttps://github.com/nanexcool)",
+    "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)"
+  ],
+  "categories": [
+    "Blockchain"
+  ],
   "license": "GLP-3.0",
   "links": {
-    "endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545"
+    "endpoint": "http://geth.dappnode:8545",
+    "homepage": "https://github.com/dappnode/DAppNodePackage-geth#readme"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dappnode/DAppNodePackage-geth.git"
+  },
+  "bugs": {
+    "url": "https://github.com/dappnode/DAppNodePackage-geth/issues"
   }
-}
+}

docker-compose.yml

@@ -1,17 +1,20 @@
-version: '3.4'
+version: "3.4"
 services:
-  ethchain-geth.public.dappnode.eth:
-    image: 'ethchain-geth.public.dappnode.eth:0.0.3'
-    build: ./build
+  geth.dnp.dappnode.eth:
+    image: "geth.dnp.dappnode.eth:0.1.9"
+    build:
+      context: ./build
+      args:
+        UPSTREAM_VERSION: v1.9.25
     volumes:
-      - 'ethchain-geth:/root/.ethereum/ethchain-geth'
+      - "geth:/root/.ethereum"
     environment:
-      - EXTRA_OPTS=
+      - "EXTRA_OPTS=--rpcapi eth,net,web3,txpool --nousb"
+      - SYNCMODE
     ports:
-      - '127.0.0.1:8546:8546'
-      - '127.0.0.1:8545:8545'
-      - '61313:30303'
-      - '61313:30303/udp'
-      - '61314:30304/udp'
+      - "30303"
+      - 30303/udp
+      - 30304/udp
+    restart: unless-stopped
 volumes:
-  ethchain-geth: {}
+  geth: {}

releases.json

@@ -0,0 +1,64 @@
+{
+  "0.1.2": {
+    "hash": "/ipfs/QmZmT9gEw7YdXHh9Yx22sHZYtWri1f1SrQxBQs4ctKkSC2",
+    "type": "directory",
+    "uploadedTo": {
+      "dappnode": "Fri, 29 Nov 2019 21:53:08 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.2&h=%2Fipfs%2FQmZmT9gEw7YdXHh9Yx22sHZYtWri1f1SrQxBQs4ctKkSC2"
+  },
+  "0.1.3": {
+    "hash": "/ipfs/QmbrBkpBGmx79B5anoTQLhq8wnYPCiz69eNWwu4jiuMGFx",
+    "type": "directory",
+    "uploadedTo": {
+      "dappnode": "Fri, 03 Jan 2020 14:56:46 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.3&h=%2Fipfs%2FQmbrBkpBGmx79B5anoTQLhq8wnYPCiz69eNWwu4jiuMGFx"
+  },
+  "0.1.4": {
+    "hash": "/ipfs/QmNqDvqAyy3pN3PvymB6chM7S1FgYyive8LosVKUuaDdfd",
+    "type": "directory",
+    "uploadedTo": {
+      "dappnode": "Fri, 06 Mar 2020 14:06:12 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.4&h=%2Fipfs%2FQmNqDvqAyy3pN3PvymB6chM7S1FgYyive8LosVKUuaDdfd"
+  },
+  "0.1.5": {
+    "hash": "/ipfs/QmYSoV4pxNZmHckZHXKCLBXBeESWYdbrCgduGFwpWLzPoi",
+    "type": "directory",
+    "uploadedTo": {
+      "dappnode": "Fri, 17 Apr 2020 12:08:45 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.5&h=%2Fipfs%2FQmYSoV4pxNZmHckZHXKCLBXBeESWYdbrCgduGFwpWLzPoi"
+  },
+  "0.1.6": {
+    "hash": "/ipfs/QmazbxJNXNn5kUe3PHRiMpJtvf91o6SUM4uFphj9znuVt3",
+    "type": "directory",
+    "uploadedTo": {
+      "remote": "Thu, 14 May 2020 16:22:40 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.6&h=%2Fipfs%2FQmazbxJNXNn5kUe3PHRiMpJtvf91o6SUM4uFphj9znuVt3"
+  },
+  "0.1.7": {
+    "hash": "/ipfs/QmTujfYrQwWG7kRwQX4nBD7TmSDjjSfRkj4CdZW3rmDJLC",
+    "type": "directory",
+    "uploadedTo": {
+      "dappnode": "Fri, 07 Aug 2020 12:53:48 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.7&h=%2Fipfs%2FQmd7jLvxVmUziFFVV9M6R4Svn7KGiM1VGg6kymbCknCgF1"
+  },
+  "0.1.8": {
+    "hash": "/ipfs/QmUf1uzqZdXyKt4YB96nr1F9GtxUWnPu8hSs7WXJnoc5Cj",
+    "uploadedTo": {
+      "remote": "Fri, 07 Aug 2020 12:54:45 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.8&h=%2Fipfs%2FQmUf1uzqZdXyKt4YB96nr1F9GtxUWnPu8hSs7WXJnoc5Cj"
+  },
+  "0.1.9": {
+    "hash": "/ipfs/QmPF4HJoNmJkoFBedv2CfVQGdPECYTmnZU3kCTodN4vkqg",
+    "uploadedTo": {
+      "dappnode": "Wed, 25 Nov 2020 09:18:56 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=geth.dnp.dappnode.eth&v=0.1.9&h=%2Fipfs%2FQmbpQoSXzPcBwm1LUeVMPosgsVUf772pN32xjDyxWnPEHT"
+  }
+}