dataexchange changes for non-root users

Signed-off-by: Nicko Guyer <[email protected]>
hyperledger · Jan 10, 2024 · 8ea90cc · 8ea90cc
1 parent 72a6ea2
commit 8ea90cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/internal/blockchain/ethereum/connector/ethconnect/config.go b/internal/blockchain/ethereum/connector/ethconnect/config.go
@@ -87,8 +87,8 @@ func (e *Ethconnect) GenerateConfig(stack *types.Stack, member *types.Organizati
 				RPC:           &RPC{URL: fmt.Sprintf("http://%s:8545", blockchainServiceName)},
 				OpenAPI: &OpenAPI{
 					EventPollingIntervalSec: 1,
-					StoragePath:             "./abis",
-					EventsDB:                "./events",
+					StoragePath:             "./data/abis",
+					EventsDB:                "./data/events",
 				},
 				HTTP: &HTTP{
 					Port: 8080,

diff --git a/internal/blockchain/ethereum/connector/ethconnect/docker.go b/internal/blockchain/ethereum/connector/ethconnect/docker.go
@@ -40,15 +40,13 @@ func (e *Ethconnect) GetServiceDefinitions(s *types.Stack, dependentServices map
 				Ports:         []string{fmt.Sprintf("%d:8080", member.ExposedConnectorPort)},
 				Volumes: []string{
 					fmt.Sprintf("ethconnect_config_%s:/ethconnect/config", member.ID),
-					fmt.Sprintf("ethconnect_abis_%s:/ethconnect/abis", member.ID),
-					fmt.Sprintf("ethconnect_events_%s:/ethconnect/events", member.ID),
+					fmt.Sprintf("ethconnect_data_%s:/ethconnect/data", member.ID),
 				},
 				Logging: docker.StandardLogOptions,
 			},
 			VolumeNames: []string{
 				fmt.Sprintf("ethconnect_config_%v", member.ID),
-				fmt.Sprintf("ethconnect_abis_%v", member.ID),
-				fmt.Sprintf("ethconnect_events_%v", member.ID),
+				fmt.Sprintf("ethconnect_data_%v", member.ID),
 			},
 		}
 	}

diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go
@@ -510,6 +510,7 @@ func (s *StackManager) copyDataExchangeConfigToVolumes() error {
 		// Copy files into docker volumes
 		memberDXDir := path.Join(configDir, "dataexchange_"+member.ID)
 		volumeName := fmt.Sprintf("%s_dataexchange_%s", s.Stack.Name, member.ID)
+		docker.MkdirInVolume(s.ctx, volumeName, "data")
 		docker.MkdirInVolume(s.ctx, volumeName, "peer-certs")
 		if err := docker.CopyFileToVolume(s.ctx, volumeName, path.Join(memberDXDir, "config.json"), "/config.json"); err != nil {
 			return err