Merge pull request #20 from dappnode/hcastc00/fix-upstream-version

refactor: standardize version format and improve Dockerfile ARG handling

Author: hcastc00

.gitignore

@@ -1,5 +1,5 @@
 # DAppNodeSDK release directories
-  build_*
-  releases.json
-  docker-compose-tmp.yml
+build_*
+releases.json
+docker-compose-tmp.yml
 

dappnode_package.json

@@ -2,16 +2,26 @@
   "upstream": [
     {
       "repo": "AztecProtocol/aztec-packages",
-      "version": "2.0.2",
+      "version": "v2.0.2",
       "arg": "UPSTREAM_VERSION"
     }
   ],
   "description": "Aztec is a privacy first L2 on Ethereum",
   "type": "service",
-  "architectures": ["linux/amd64"],
+  "architectures": [
+    "linux/amd64"
+  ],
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
-  "categories": ["Blockchain", "ETH2.0"],
-  "keywords": ["aztec", "validator", "rollup", "privacy"],
+  "categories": [
+    "Blockchain",
+    "ETH2.0"
+  ],
+  "keywords": [
+    "aztec",
+    "validator",
+    "rollup",
+    "privacy"
+  ],
   "links": {
     "homepage": "https://aztec.network",
     "readme": "https://github.com/DAppNode/DAppNodePackage-aztec-generic#readme",
@@ -27,8 +37,12 @@
   },
   "globalEnvs": [
     {
-      "envs": ["PUBLIC_IP"],
-      "services": ["sequencer"]
+      "envs": [
+        "PUBLIC_IP"
+      ],
+      "services": [
+        "sequencer"
+      ]
     }
   ]
-}
+}

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: sequencer
       args:
-        UPSTREAM_VERSION: 2.0.2
+        UPSTREAM_VERSION: v2.0.2
         DATA_DIRECTORY: /data
     volumes:
       - sequencer-data:/data

package_variants/sepolia/docker-compose.yml

@@ -7,7 +7,6 @@ services:
     environment:
       ETHEREUM_HOSTS: http://geth.sepolia-geth.dappnode:8545
       L1_CONSENSUS_HOST_URLS: http://prysm-sepolia.dappnode:3500
-      SYNC_SNAPSHOTS_URL: https://aztec.denodes.xyz/snapshot/
     ports:
       - 40400:40400/tcp
       - 40400:40400/udp

sequencer/Dockerfile

@@ -1,16 +1,15 @@
-ARG UPSTREAM_VERSION
+# syntax=docker/dockerfile-upstream:master
+ARG UPSTREAM_VERSION             # e.g. v1.2.3
+FROM aztecprotocol/aztec:${UPSTREAM_VERSION#v}
 
-FROM aztecprotocol/aztec:${UPSTREAM_VERSION}
-
-# Set ENV variables based on the build-time ARGs
 ARG NETWORK
 ARG L1_CHAIN_ID
 ARG DATA_DIRECTORY
 
 ENV NETWORK=${NETWORK} \
+    L1_CHAIN_ID=${L1_CHAIN_ID} \
     DATA_DIRECTORY=${DATA_DIRECTORY}
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
-
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]