Extend template compose file (#2)

dappnode_package_template.json → dappnode_package.json

@@ -1,6 +1,4 @@
 {
-  "arg": "NETWORK",
-  "argInServices": ["geth"],
   "upstreamVersion": "v1.13.14",
   "upstreamRepo": "ethereum/go-ethereum",
   "upstreamArg": "UPSTREAM_VERSION",

docker-compose.yml

@@ -1,18 +1,16 @@
 version: "3.5"
 services:
   geth:
-    # TODO: image should be defined by SDK in build action (alredy done in theory)
+    # TODO: image should be defined by SDK in build action (already done in theory)
     build:
       context: geth
       args:
         UPSTREAM_VERSION: v1.13.14
-        # TODO: SDK should add here NETWORK (passed as flag to build action)
     volumes:
       - "geth:/root/.ethereum"
     environment:
       - EXTRA_FLAGS=--http.api eth,engine,net,web3,txpool
       - SYNCMODE=snap
     restart: unless-stopped
-    # TODO: Add ports here from package_variants/NETWORK/dappnode_package.json (ports array)
 volumes:
   geth: {}

package_variants/goerli/dappnode_package.json

@@ -28,6 +28,5 @@
       "serviceName": "geth",
       "port": 8546
     }
-  ],
-  "ports": ["30803:30803/tcp", "30803:30803/udp"]
+  ]
 }

package_variants/goerli/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.5"
+services:
+  geth:
+    environment:
+      NETWORK: "goerli"
+    ports:
+      - "30803:30803/tcp"
+      - "30803:30803/udp"

package_variants/holesky/dappnode_package.json

@@ -28,6 +28,5 @@
       "serviceName": "geth",
       "port": 8546
     }
-  ],
-  "ports": ["31403:31403/tcp", "31403:31403/udp"]
+  ]
 }

package_variants/holesky/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.5"
+services:
+  geth:
+    environment:
+      NETWORK: "holesky"
+    ports:
+      - "31403:31403/tcp"
+      - "31403:31403/udp"

package_variants/lukso/dappnode_package.json

@@ -28,6 +28,5 @@
       "serviceName": "geth",
       "port": 8546
     }
-  ],
-  "ports": ["33141:33141/tcp", "33141:33141/udp"]
+  ]
 }

package_variants/lukso/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.5"
+services:
+  geth:
+    environment:
+      NETWORK: "lukso"
+    ports:
+      - "33141:33141/tcp"
+      - "33141:33141/udp"

package_variants/mainnet/dappnode_package.json

@@ -28,6 +28,5 @@
       "serviceName": "geth",
       "port": 8546
     }
-  ],
-  "ports": ["30403:30403/tcp", "30403:30403/udp"]
+  ]
 }

package_variants/mainnet/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.5"
+services:
+  geth:
+    environment:
+      NETWORK: "mainnet"
+    ports:
+      - "30403:30403/tcp"
+      - "30403:30403/udp"

package_variants/sepolia/dappnode_package.json

@@ -21,6 +21,5 @@
       "fromSubdomain": "sepolia-geth",
       "port": 8545
     }
-  ],
-  "ports": ["35415:35415/tcp", "35415:35415/udp"]
+  ]
 }

package_variants/sepolia/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.5"
+services:
+  geth:
+    environment:
+      NETWORK: "sepolia"
+    ports:
+      - "35415:35415/tcp"
+      - "35415:35415/udp"