Merge pull request #12 from dappnode/add_pid

Add pid
dappnode · Sep 3, 2021 · 78e9e24 · 78e9e24
2 parents ab6542c + 475b1c9
commit 78e9e24
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/dappnode_package.json b/dappnode_package.json
@@ -3,7 +3,7 @@
   "version": "0.1.8",
   "shortDescription": "Ethereum client on the efficiency frontier, written in Go",
   "description": "Erigon is a next generation Ethereum client that introduces several new concepts:\n\n* A modular client design, enabling parallelized development of the client\n\n* New (`flat`) model of storing Ethereum state, allowing a lower disk footprint\n\n* Preprocessing of data outside of the storage engine, making database write operations faster by a magnitude\n\n* Staged synchronization technique, allowing very fast synchronization",
-  "upstreamVersion": "v2021.08.05",
+  "upstreamVersion": "v2021.09.01",
   "upstreamRepo": "ledgerwatch/erigon",
   "upstreamArg": "UPSTREAM_VERSION",
   "type": "service",
@@ -12,7 +12,8 @@
   "architectures": ["linux/amd64"],
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
   "contributors": [
-    "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)"
+    "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",
+    "Pablo Mendez <mendez4a@gmail.com> (https://github.com/pablomendezroyo)"
   ],
   "links": {
     "endpoint": "http://rpcdaemon.erigon.dappnode:8545",
@@ -26,5 +27,13 @@
   },
   "bugs": {
     "url": "https://github.com/dappnode/DAppNodePackage-erigon/issues"
-  }
+  },
+  "exposable": [
+    {
+      "name": "Erigon JSON RPC",
+      "description": "JSON RPC endpoint for Erigon mainnet",
+      "serviceName": "rpcdaemon",
+      "port": 8545
+    }
+  ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: erigon
       args:
-        UPSTREAM_VERSION: v2021.08.05
+        UPSTREAM_VERSION: v2021.09.01
     ports:
       - 30303/tcp
       - 30303/udp
@@ -21,12 +21,12 @@ services:
     build:
       context: rpcdaemon
       args:
-        UPSTREAM_VERSION: v2021.08.05
+        UPSTREAM_VERSION: v2021.09.01
+    pid: "service:erigon"
     environment:
       RPCDAEMON_EXTRA_OPTS: "--http.api=eth,debug,net,web3"
     restart: unless-stopped
     volumes:
-      - "rpc:/home/erigon/.local/share"
+      - "data:/home/erigon/.local/share"
 volumes:
   data: {}
-  rpc: {}
diff --git a/erigon/Dockerfile b/erigon/Dockerfile
@@ -8,4 +8,3 @@ COPY entrypoint.sh /usr/bin/entrypoint.sh
 RUN chmod u+x /usr/bin/entrypoint.sh
 
 ENTRYPOINT [ "/usr/bin/entrypoint.sh" ]
-
diff --git a/rpcdaemon/Dockerfile b/rpcdaemon/Dockerfile
@@ -2,7 +2,10 @@ ARG UPSTREAM_VERSION
 
 FROM thorax/erigon:${UPSTREAM_VERSION}
 
+USER root
+
 ENTRYPOINT [ "sh", "-c", "exec rpcdaemon \
+    --datadir=/home/erigon/.local/share \
     --private.api.addr=\"erigon:9090\" \
     --http.addr=\"0.0.0.0\" \
     --http.vhosts=\"*\" \