updated docker-compose.yml and TESNETDIR variable.

multiversx · Feb 28, 2024 · 8c7bb58 · 8c7bb58
1 parent 4c79c53
commit 8c7bb58
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build_local_tesnet.yml b/.github/workflows/build_local_tesnet.yml
@@ -35,3 +35,5 @@ jobs:
           cd ${GITHUB_WORKSPACE}/scripts/docker-testnet
           export TESTNETDIR=${GITHUB_WORKSPACE}/docker-testnet
           ./prepare.sh
+          
+          
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.2
     volumes:
-      - ${DOCKER_CONFIG_PATH}/seednode/config:/go/mx-chain-go/cmd/seednode/config
+      - ${TESTNETDIR}/seednode/config:/go/mx-chain-go/cmd/seednode/config
 
   validator00:
     image: node:dev
@@ -24,7 +24,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.3
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [seednode]
 
   validator01:
@@ -38,7 +38,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.4
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [seednode]
 
   validator02:
@@ -52,7 +52,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.5
     volumes:
-      - /${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [seednode]
 
   validator03:
@@ -66,7 +66,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.6
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
   validator04:
@@ -80,7 +80,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.7
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
   validator05:
@@ -94,7 +94,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.8
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
 
@@ -109,7 +109,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.9
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
   validator07:
@@ -123,7 +123,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.10
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
   validator08:
@@ -137,7 +137,7 @@ services:
       local-testnet:
         ipv4_address: 172.18.0.11
     volumes:
-      - ${DOCKER_CONFIG_PATH}/node/config:/go/mx-chain-go/cmd/node/config
+      - ${TESTNETDIR}/node/config:/go/mx-chain-go/cmd/node/config
     depends_on: [ seednode ]
 
 
@@ -150,7 +150,7 @@ services:
     networks:
       local-testnet:
     volumes:
-      - ${DOCKER_CONFIG_PATH}/proxy/config:/mx-chain-proxy-go/cmd/proxy/config
+      - ${TESTNETDIR}/proxy/config:/mx-chain-proxy-go/cmd/proxy/config
 
 networks:
   local-testnet:

diff --git a/scripts/docker-testnet/variables.sh b/scripts/docker-testnet/variables.sh
@@ -17,7 +17,7 @@ export USE_TXGEN=0
 # Path where the testnet will be instantiated. This folder is assumed to not
 # exist, but it doesn't matter if it already does. It will be created if not,
 # anyway.
-export TESTNETDIR="$HOME/MultiversX/testnet"
+export TESTNETDIR="$MULTIVERSXDIR/MultiversX/testnet"
 
 # Path to mx-chain-deploy-go, branch: master. Default: near mx-chain-go.
 export CONFIGGENERATORDIR="$MULTIVERSXDIR/mx-chain-deploy-go/cmd/filegen"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,5 @@ jobs:
		cd ${GITHUB_WORKSPACE}/scripts/docker-testnet
		export TESTNETDIR=${GITHUB_WORKSPACE}/docker-testnet
		./prepare.sh