Merge branch 'master' into cdp-integration

cmd/export_ledger_entry_changes_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 const coreExecutablePath = "../stellar-core/src/stellar-core"
-const coreConfigPath = "./docker/stellar-core.cfg"
+const coreConfigPath = "/etl/docker/stellar-core.cfg"
 
 func TestExportChanges(t *testing.T) {
 

docker/Dockerfile

@@ -18,6 +18,9 @@ WORKDIR /etl
 COPY --from=build /usr/local/bin/stellar-etl /usr/local/bin/stellar-etl
 COPY --from=build /usr/src/etl/docker docker
 
+# changing workdir to a new path in order to use mounted empty ephemeral volumes as storage
+WORKDIR /etl/data
+
 # clear entrypoint from stellar-core image
 ENTRYPOINT []
 

internal/utils/main.go

@@ -657,7 +657,7 @@ func GetEnvironmentDetails(isTest bool, isFuture bool, datastoreUrl string) (det
 		details.NetworkPassphrase = network.TestNetworkPassphrase
 		details.ArchiveURLs = testArchiveURLs
 		details.BinaryPath = "/usr/bin/stellar-core"
-		details.CoreConfig = "docker/stellar-core_testnet.cfg"
+    details.CoreConfig = "/etl/docker/stellar-core_testnet.cfg"
 		// TODO: change exporter-test to the real bucket whatever that is
 		details.StorageURL = datastoreUrl
 		return details
@@ -666,15 +666,15 @@ func GetEnvironmentDetails(isTest bool, isFuture bool, datastoreUrl string) (det
 		details.NetworkPassphrase = "Test SDF Future Network ; October 2022"
 		details.ArchiveURLs = futureArchiveURLs
 		details.BinaryPath = "/usr/bin/stellar-core"
-		details.CoreConfig = "docker/stellar-core_futurenet.cfg"
+    details.CoreConfig = "/etl/docker/stellar-core_futurenet.cfg"
 		details.StorageURL = datastoreUrl
 		return details
 	} else {
 		// default: mainnet
 		details.NetworkPassphrase = network.PublicNetworkPassphrase
 		details.ArchiveURLs = mainArchiveURLs
 		details.BinaryPath = "/usr/bin/stellar-core"
-		details.CoreConfig = "docker/stellar-core.cfg"
+		details.CoreConfig = "/etl/docker/stellar-core.cfg"
 		details.StorageURL = datastoreUrl
 		return details
 	}