From c3a5a63894e5f6bda1ce9824811d9376bedda062 Mon Sep 17 00:00:00 2001
From: dappnodedev <diego@dappnode.io>
Date: Fri, 14 Jun 2024 16:33:19 +0200
Subject: [PATCH] Use new upstream format

---
 dappnode_package.json | 15 ++++++++++++---
 docker-compose.yml    |  2 +-
 operator/Dockerfile   |  4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dappnode_package.json b/dappnode_package.json
index 3f33bf7..730f3fe 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -1,9 +1,18 @@
 {
   "name": "ssv.dnp.dappnode.eth",
   "version": "0.1.1",
-  "upstreamVersion": "v1.3.4",
-  "upstreamRepo": "bloxapp/ssv",
-  "upstreamArg": "UPSTREAM_VERSION",
+  "upstream":[
+    {
+      "repo": "ssvlabs/ssv",
+      "version": "v1.3.4",
+      "arg": "OPERATOR_UPSTREAM_VERSION"
+    },
+    {
+      "repo": "ssvlabs/ssv-dkg",
+      "version": "v2.1.0",
+      "arg": "DKG_UPSTREAM_VERSION"
+    }
+  ],
   "architectures": ["linux/amd64"],
   "shortDescription": "Secret Shared Validator for Ethereum mainnet",
   "description": "SSV.network is a decentralized ETH staking network enabling the distributed operation of an Ethereum validator. The network allows both users and operators to diversify staking risks, optimize performance, and promote decentralization across the Ethereum consensus layer.",
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f951b0..1da4b6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: operator
       args:
-        UPSTREAM_VERSION: v1.3.4
+        OPERATOR_UPSTREAM_VERSION: v1.3.4
     restart: unless-stopped
     volumes:
       - operator-data:/data/operator
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 5768cc3..717e9d5 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -1,6 +1,6 @@
-ARG UPSTREAM_VERSION
+ARG OPERATOR_UPSTREAM_VERSION
 
-FROM bloxstaking/ssv-node:${UPSTREAM_VERSION}
+FROM bloxstaking/ssv-node:${OPERATOR_UPSTREAM_VERSION}
 
 # Use apt
 RUN apt-get update && \