From 5716897608d0bf669e8f8c00a5a896dbb2c45f3d Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@jamie-fw6y753hq7-mbp.lan>
Date: Thu, 21 Nov 2024 15:37:25 -0800
Subject: [PATCH 1/7] Make KT_REFERENCE_SERVER_CONFIG optional

---
 .run/Reference Server_ default.run.xml        |  1 -
 .../Test Profile_ auth-apikey-custody.run.xml |  1 -
 ...Test Profile_ auth-apikey-platform.run.xml |  1 -
 .run/Test Profile_ auth-jwt-custody.run.xml   |  1 -
 .run/Test Profile_ auth-jwt-platform.run.xml  |  1 -
 .run/Test Profile_ custody.run.xml            |  1 -
 .run/Test Profile_ default.run.xml            |  1 -
 .run/Test Profile_ deployment.run.xml         | 45 +++++++++----------
 ...Test Profile_ host.docker.internal.run.xml |  3 --
 .run/Test Profile_ kafka-sasl-ssl.run.xml     |  1 -
 .run/Test Profile_ rpc.run.xml                |  1 -
 .../stellar/reference/di/ConfigContainer.kt   | 21 ++++-----
 .../run_profiles/RunKotlinReferenceServer.kt  | 13 +++++-
 .../platform/run_profiles/RunTestProfile.kt   | 13 +++++-
 14 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/.run/Reference Server_ default.run.xml b/.run/Reference Server_ default.run.xml
index 66b6680ca5..1498a7583c 100644
--- a/.run/Reference Server_ default.run.xml	
+++ b/.run/Reference Server_ default.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="default" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunKotlinReferenceServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ auth-apikey-custody.run.xml b/.run/Test Profile_ auth-apikey-custody.run.xml
index 67a70bf685..9c296022c3 100644
--- a/.run/Test Profile_ auth-apikey-custody.run.xml	
+++ b/.run/Test Profile_ auth-apikey-custody.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-custody" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ auth-apikey-platform.run.xml b/.run/Test Profile_ auth-apikey-platform.run.xml
index 554a8220fb..2c8b9f225b 100644
--- a/.run/Test Profile_ auth-apikey-platform.run.xml	
+++ b/.run/Test Profile_ auth-apikey-platform.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-platform" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ auth-jwt-custody.run.xml b/.run/Test Profile_ auth-jwt-custody.run.xml
index 4ca58cc0eb..4dfbb6c12c 100644
--- a/.run/Test Profile_ auth-jwt-custody.run.xml	
+++ b/.run/Test Profile_ auth-jwt-custody.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-custody" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ auth-jwt-platform.run.xml b/.run/Test Profile_ auth-jwt-platform.run.xml
index d9f113c516..6740643b47 100644
--- a/.run/Test Profile_ auth-jwt-platform.run.xml	
+++ b/.run/Test Profile_ auth-jwt-platform.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-platform" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ custody.run.xml b/.run/Test Profile_ custody.run.xml
index a544e1b596..a185b74ce4 100644
--- a/.run/Test Profile_ custody.run.xml	
+++ b/.run/Test Profile_ custody.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="custody" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ default.run.xml b/.run/Test Profile_ default.run.xml
index d64910eab6..b3dd37c403 100644
--- a/.run/Test Profile_ default.run.xml	
+++ b/.run/Test Profile_ default.run.xml	
@@ -2,7 +2,6 @@
   <configuration default="false" name="Test Profile: default" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Test Profile_ deployment.run.xml b/.run/Test Profile_ deployment.run.xml
index 413ecb756f..6e17cb4e11 100644
--- a/.run/Test Profile_ deployment.run.xml	
+++ b/.run/Test Profile_ deployment.run.xml	
@@ -1,25 +1,24 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Test Profile: deployment" type="JetRunConfigurationType" folderName="Run Test Profile">
-        <envs>
-            <env name="app.enableTest" value="true" />
-            <env name="TEST_PROFILE_NAME" value="deployment" />
-            <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
-        </envs>
-        <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
-        <module name="java-stellar-anchor-sdk.service-runner.main" />
-        <shortenClasspath name="ARGS_FILE" />
-        <extension name="net.ashald.envfile">
-            <option name="IS_ENABLED" value="false" />
-            <option name="IS_SUBST" value="false" />
-            <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-            <option name="IS_IGNORE_MISSING_FILES" value="false" />
-            <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-            <ENTRIES>
-                <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-            </ENTRIES>
-        </extension>
-        <method v="2">
-            <option name="Make" enabled="true" />
-        </method>
-    </configuration>
+  <configuration default="false" name="Test Profile: deployment" type="JetRunConfigurationType" folderName="Run Test Profile">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="deployment" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/Test Profile_ host.docker.internal.run.xml b/.run/Test Profile_ host.docker.internal.run.xml
index 0f538844b0..46a3c5cf4a 100644
--- a/.run/Test Profile_ host.docker.internal.run.xml	
+++ b/.run/Test Profile_ host.docker.internal.run.xml	
@@ -1,8 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: host.docker.internal" type="JetRunConfigurationType" folderName="Run Test Profile">
-    <envs>
-      <env name=";KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yamlTEST_PROFILE_NAME=host-docker-internal" />
-    </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Test Profile_ kafka-sasl-ssl.run.xml b/.run/Test Profile_ kafka-sasl-ssl.run.xml
index 8ec3d649d4..6b3b4bbbd0 100644
--- a/.run/Test Profile_ kafka-sasl-ssl.run.xml	
+++ b/.run/Test Profile_ kafka-sasl-ssl.run.xml	
@@ -2,7 +2,6 @@
   <configuration default="false" name="Test Profile: kafka-sasl-ssl" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
       <env name="TEST_PROFILE_NAME" value="kafka-sasl-ssl" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ rpc.run.xml b/.run/Test Profile_ rpc.run.xml
index cc0646185d..43bcc9af38 100644
--- a/.run/Test Profile_ rpc.run.xml	
+++ b/.run/Test Profile_ rpc.run.xml	
@@ -3,7 +3,6 @@
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="rpc" />
-      <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ConfigContainer.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ConfigContainer.kt
index abb0ff3554..16038e769f 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ConfigContainer.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ConfigContainer.kt
@@ -2,12 +2,12 @@ package org.stellar.reference.di
 
 import com.sksamuel.hoplite.*
 import org.stellar.reference.data.Config
-import org.stellar.reference.data.LocationConfig
 
 class ConfigContainer(envMap: Map<String, String>?) {
   var config: Config = readCfg(envMap)
-
   companion object {
+    const val KT_REFERENCE_SERVER_CONFIG = "kt.reference.server.config"
+
     @Volatile private var instance: ConfigContainer? = null
 
     fun init(envMap: Map<String, String>?): ConfigContainer {
@@ -20,20 +20,15 @@ class ConfigContainer(envMap: Map<String, String>?) {
     }
 
     private fun readCfg(envMap: Map<String, String>?): Config {
-      // Load location config
-      val locationCfg =
-        ConfigLoaderBuilder.default()
-          .addPropertySource(PropertySource.environment())
-          .build()
-          .loadConfig<LocationConfig>()
-
       val cfgBuilder = ConfigLoaderBuilder.default()
       // Add environment variables as a property source.
       cfgBuilder.addPropertySource(PropertySource.environment())
-      envMap?.run { cfgBuilder.addMapSource(this) }
-      // Add config file as a property source if valid
-      locationCfg.fold({}, { cfgBuilder.addFileSource(it.ktReferenceServerConfig) })
-
+      envMap?.run {
+        cfgBuilder.addMapSource(this)
+        if (envMap[KT_REFERENCE_SERVER_CONFIG] != null) {
+          cfgBuilder.addFileSource(envMap[KT_REFERENCE_SERVER_CONFIG]!!)
+        }
+      }
       return cfgBuilder.build().loadConfigOrThrow<Config>()
     }
   }
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunKotlinReferenceServer.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunKotlinReferenceServer.kt
index 2a628d1a9a..89fb7b312a 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunKotlinReferenceServer.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunKotlinReferenceServer.kt
@@ -4,9 +4,20 @@ package org.stellar.anchor.platform.run_profiles
 
 import kotlinx.coroutines.runBlocking
 import org.stellar.anchor.platform.*
+import org.stellar.reference.di.ConfigContainer.Companion.KT_REFERENCE_SERVER_CONFIG
 
 fun main() = runBlocking {
-  testProfileExecutor = TestProfileExecutor(TestConfig())
+  testProfileExecutor =
+    TestProfileExecutor(
+      TestConfig().also {
+        // if KT_REFERENCE_SERVER_CONFIG environment variable is not set, set it to the default
+        // value: "service-runner/src/main/resources/config/reference-config.yaml"
+        if (it.env[KT_REFERENCE_SERVER_CONFIG] == null) {
+          it.env[KT_REFERENCE_SERVER_CONFIG] =
+            "service-runner/src/main/resources/config/reference-config.yaml"
+        }
+      }
+    )
   registerShutdownHook(testProfileExecutor)
   testProfileExecutor.start(true) {
     it.env[RUN_DOCKER] = "false"
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
index d285877b4d..8e0ffc4b09 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
@@ -7,9 +7,20 @@ import kotlinx.coroutines.runBlocking
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.TestProfileExecutor
 import org.stellar.anchor.platform.testProfileExecutor
+import org.stellar.reference.di.ConfigContainer.Companion.KT_REFERENCE_SERVER_CONFIG
 
 fun main() = runBlocking {
-  testProfileExecutor = TestProfileExecutor(TestConfig())
+  testProfileExecutor =
+    TestProfileExecutor(
+      TestConfig().also {
+        // if KT_REFERENCE_SERVER_CONFIG environment variable is not set, set it to the default
+        // value: "service-runner/src/main/resources/config/reference-config.yaml"
+        if (it.env[KT_REFERENCE_SERVER_CONFIG] == null) {
+          it.env[KT_REFERENCE_SERVER_CONFIG] =
+            "service-runner/src/main/resources/config/reference-config.yaml"
+        }
+      }
+    )
   launch { registerShutdownHook(testProfileExecutor) }
   testProfileExecutor.start(true)
 }

From c5579da3a0dbae4651e3df27afe54edc71af2a31 Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@jamie-fw6y753hq7-mbp.lan>
Date: Thu, 21 Nov 2024 16:14:17 -0800
Subject: [PATCH 2/7] Remove app.enableTest environment variables from Run
 Configs

---
 .run/Reference Server_ default.run.xml          | 1 -
 .run/Test Profile_ auth-apikey-custody.run.xml  | 1 -
 .run/Test Profile_ auth-apikey-platform.run.xml | 1 -
 .run/Test Profile_ auth-jwt-custody.run.xml     | 2 +-
 .run/Test Profile_ auth-jwt-platform.run.xml    | 1 -
 .run/Test Profile_ custody.run.xml              | 1 -
 .run/Test Profile_ default.run.xml              | 3 ---
 .run/Test Profile_ deployment.run.xml           | 1 -
 .run/Test Profile_ kafka-sasl-ssl.run.xml       | 1 -
 .run/Test Profile_ rpc.run.xml                  | 1 -
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.run/Reference Server_ default.run.xml b/.run/Reference Server_ default.run.xml
index 1498a7583c..a7feb8889c 100644
--- a/.run/Reference Server_ default.run.xml	
+++ b/.run/Reference Server_ default.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Reference Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="default" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunKotlinReferenceServer" />
diff --git a/.run/Test Profile_ auth-apikey-custody.run.xml b/.run/Test Profile_ auth-apikey-custody.run.xml
index 9c296022c3..8306e52924 100644
--- a/.run/Test Profile_ auth-apikey-custody.run.xml	
+++ b/.run/Test Profile_ auth-apikey-custody.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: auth-apikey-custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-custody" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ auth-apikey-platform.run.xml b/.run/Test Profile_ auth-apikey-platform.run.xml
index 2c8b9f225b..ddf7793423 100644
--- a/.run/Test Profile_ auth-apikey-platform.run.xml	
+++ b/.run/Test Profile_ auth-apikey-platform.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: auth-apikey-platform" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-platform" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ auth-jwt-custody.run.xml b/.run/Test Profile_ auth-jwt-custody.run.xml
index 4dfbb6c12c..f82abec98a 100644
--- a/.run/Test Profile_ auth-jwt-custody.run.xml	
+++ b/.run/Test Profile_ auth-jwt-custody.run.xml	
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: auth-jwt-custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-custody" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <option name="REDIRECT_INPUT" value="true" />
     <shortenClasspath name="ARGS_FILE" />
     <extension name="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />
diff --git a/.run/Test Profile_ auth-jwt-platform.run.xml b/.run/Test Profile_ auth-jwt-platform.run.xml
index 6740643b47..75d2815cb7 100644
--- a/.run/Test Profile_ auth-jwt-platform.run.xml	
+++ b/.run/Test Profile_ auth-jwt-platform.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: auth-jwt-platform" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-platform" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ custody.run.xml b/.run/Test Profile_ custody.run.xml
index a185b74ce4..50b23ec8c2 100644
--- a/.run/Test Profile_ custody.run.xml	
+++ b/.run/Test Profile_ custody.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="custody" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ default.run.xml b/.run/Test Profile_ default.run.xml
index b3dd37c403..8c4baa55ed 100644
--- a/.run/Test Profile_ default.run.xml	
+++ b/.run/Test Profile_ default.run.xml	
@@ -1,8 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: default" type="JetRunConfigurationType" folderName="Run Test Profile">
-    <envs>
-      <env name="app.enableTest" value="true" />
-    </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Test Profile_ deployment.run.xml b/.run/Test Profile_ deployment.run.xml
index 6e17cb4e11..6e096620fb 100644
--- a/.run/Test Profile_ deployment.run.xml	
+++ b/.run/Test Profile_ deployment.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: deployment" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="deployment" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ kafka-sasl-ssl.run.xml b/.run/Test Profile_ kafka-sasl-ssl.run.xml
index 6b3b4bbbd0..f010567a8e 100644
--- a/.run/Test Profile_ kafka-sasl-ssl.run.xml	
+++ b/.run/Test Profile_ kafka-sasl-ssl.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: kafka-sasl-ssl" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="kafka-sasl-ssl" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
diff --git a/.run/Test Profile_ rpc.run.xml b/.run/Test Profile_ rpc.run.xml
index 43bcc9af38..1119083fa1 100644
--- a/.run/Test Profile_ rpc.run.xml	
+++ b/.run/Test Profile_ rpc.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test Profile: rpc" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
-      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="rpc" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />

From 17874e723a35ea58292ed419d4943b90a9b2ef72 Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@jamie-fw6y753hq7-mbp.lan>
Date: Thu, 21 Nov 2024 17:47:28 -0800
Subject: [PATCH 3/7] Refactor the docker compose with profiles

---
 docker-compose.yaml                           | 77 +++++++++++++++++++
 docs/README.md                                | 14 +++-
 .../anchor/platform/ServiceRunner.java        |  9 +--
 .../org/stellar/anchor/platform/TestConfig.kt |  7 +-
 .../main/resources/common/docker-compose.yaml | 14 +++-
 .../src/main/resources/docker-compose.yaml    | 51 ------------
 6 files changed, 109 insertions(+), 63 deletions(-)
 create mode 100644 docker-compose.yaml
 delete mode 100644 service-runner/src/main/resources/docker-compose.yaml

diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000000..cd8b210473
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,77 @@
+services:
+  v2-stable-servers:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: dev-servers
+    image: stellar/anchor-platform:2.11.2
+    profiles:
+      - 'v2-stable'
+    labels:
+      description: |
+        Runs all of the Anchor Platform services for the v2 stable release.
+        To start the services: `docker-compose --profile v2-stable up`
+      maintainer: "jamie@stellar.org"
+
+  stable-servers:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: dev-servers
+    image: stellar/anchor-platform:latest
+    profiles:
+      - 'latest'
+    labels:
+      description: |
+        Runs all of the Anchor Platform services for the latest release.
+        To start the services: `docker-compose --profile latest up`
+      maintainer: "jamie@stellar.org"
+
+  platform:
+    profiles:
+      - ''
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: platform
+    depends_on:
+      - db
+      - kafka
+      - reference-server
+      - sep24-reference-ui
+
+  observer:
+    profiles:
+      - ''
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: observer
+    depends_on:
+      - db
+      - kafka
+
+  reference-server:
+    profiles:
+      - ''
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: reference-server
+    depends_on:
+      - reference-db
+
+  sep24-reference-ui:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: sep24-reference-ui
+
+  kafka:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: kafka
+
+  db:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: db
+
+  reference-db:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: reference-db
diff --git a/docs/README.md b/docs/README.md
index fb1fb28298..5439f3728b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -51,12 +51,18 @@ contribute to this project.
 
 ## Quickstart
 
-Anchor Platform can be run locally using Docker Compose. This will start an instance of the Anchor Platform and the
-Kotlin reference server.
+Anchor Platform can be run locally using Docker Compose. 
 
+### For version 2.x.x stable release
 ```shell
-docker build --build-arg BASE_IMAGE=gradle:7.6.4-jdk17 -t anchor-platform:local ./
-docker compose -f service-runner/src/main/resources/docker-compose.yaml up -d
+# In the root directory of the project
+docker compose --profile v2-stable up -d
+```
+
+### For latest release
+```shell
+# In the root directory of the project
+docker compose --profile latest up -d
 ```
 
 The [Stellar Demo Wallet](https://demo-wallet.stellar.org) can be used to interact with the Anchor Platform. To get
diff --git a/service-runner/src/main/java/org/stellar/anchor/platform/ServiceRunner.java b/service-runner/src/main/java/org/stellar/anchor/platform/ServiceRunner.java
index b76562a33c..3e04c2adec 100644
--- a/service-runner/src/main/java/org/stellar/anchor/platform/ServiceRunner.java
+++ b/service-runner/src/main/java/org/stellar/anchor/platform/ServiceRunner.java
@@ -4,7 +4,6 @@
 
 import java.util.Map;
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
@@ -16,15 +15,15 @@
 import org.stellar.reference.wallet.WalletServerStartKt;
 
 public class ServiceRunner {
-
   public static void main(String[] args) {
     printBanner();
+    startServers(args);
+  }
 
+  private static void startServers(String[] args) {
     Options options = getOptions();
-    CommandLineParser parser = new DefaultParser();
-
     try {
-      CommandLine cmd = parser.parse(options, args);
+      CommandLine cmd = new DefaultParser().parse(options, args);
       boolean anyServerStarted = false;
       if (cmd.hasOption("sep-server") || cmd.hasOption("all")) {
         startSepServer(null);
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestConfig.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestConfig.kt
index 5524094e98..462dff08a2 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestConfig.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestConfig.kt
@@ -19,13 +19,16 @@ import org.stellar.anchor.util.StringHelper.isNotEmpty
  * @constructor creates a TestConfig instance
  */
 class TestConfig {
+  companion object {
+    const val TEST_PROFILE_NAME = "TEST_PROFILE_NAME"
+  }
   val env = mutableMapOf<String, String>()
   // override test profile name with TEST_PROFILE_NAME system env variable
-  private val envProfileName = System.getenv("TEST_PROFILE_NAME") ?: null
+  private val envProfileName = System.getenv(TEST_PROFILE_NAME) ?: null
 
   constructor(testProfileName: String? = null, customize: () -> Unit = {}) {
     var profileName = testProfileName
-    if (System.getenv("TEST_PROFILE_NAME") != null) profileName = System.getenv("TEST_PROFILE_NAME")
+    if (System.getenv(TEST_PROFILE_NAME) != null) profileName = System.getenv(TEST_PROFILE_NAME)
 
     if (this.envProfileName != null) profileName = this.envProfileName
     // starting from the default test.env file
diff --git a/service-runner/src/main/resources/common/docker-compose.yaml b/service-runner/src/main/resources/common/docker-compose.yaml
index aa3364d40c..09a496262b 100644
--- a/service-runner/src/main/resources/common/docker-compose.yaml
+++ b/service-runner/src/main/resources/common/docker-compose.yaml
@@ -1,4 +1,16 @@
 services:
+  dev-servers:
+    environment:
+      - KT_REFERENCE_SERVER_CONFIG=/config/reference-config.yaml
+    command: -t
+    volumes:
+      - ../config:/config
+    ports:
+      - "8080:8080" # SEP server
+      - "8085:8085" # Platform server
+      - "8091:8091" # Reference server
+      - "8092:8092" # Reference server
+
   platform:
     image: anchor-platform:local
     command: --sep-server --platform-server --event-processor
@@ -44,7 +56,7 @@ services:
       - "8091:8091"
 
   kafka:
-    platform: linux/x86_64
+    platform: linux
     image: confluentinc/cp-kafka:7.4.3
     ports:
       - "29092:29092"
diff --git a/service-runner/src/main/resources/docker-compose.yaml b/service-runner/src/main/resources/docker-compose.yaml
deleted file mode 100644
index 7e16d3a3dd..0000000000
--- a/service-runner/src/main/resources/docker-compose.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-services:
-  platform:
-    extends:
-      file: common/docker-compose.yaml
-      service: platform
-    env_file:
-      - profiles/${TEST_PROFILE_NAME:-deployment}/config.env
-      - profiles/${TEST_PROFILE_NAME:-deployment}/test.env
-    depends_on:
-      - db
-      - kafka
-      - reference-server
-      - sep24-reference-ui
-
-  observer:
-    extends:
-      file: common/docker-compose.yaml
-      service: observer
-    env_file:
-      - profiles/${TEST_PROFILE_NAME:-deployment}/config.env
-      - profiles/${TEST_PROFILE_NAME:-deployment}/test.env
-    depends_on:
-      - db
-      - kafka
-
-  reference-server:
-    extends:
-      file: common/docker-compose.yaml
-      service: reference-server
-    depends_on:
-      - reference-db
-
-  sep24-reference-ui:
-    extends:
-      file: common/docker-compose.yaml
-      service: sep24-reference-ui
-
-  kafka:
-    extends:
-      file: common/docker-compose.yaml
-      service: kafka
-
-  db:
-    extends:
-      file: common/docker-compose.yaml
-      service: db
-
-  reference-db:
-    extends:
-      file: common/docker-compose.yaml
-      service: reference-db

From ee4729db14666f65698a4414eb49d87df344b53f Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@stellar.org>
Date: Fri, 22 Nov 2024 09:43:10 -0800
Subject: [PATCH 4/7] Take care of PR feedback

---
 .run/Test Profile_ auth-jwt-custody.run.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.run/Test Profile_ auth-jwt-custody.run.xml b/.run/Test Profile_ auth-jwt-custody.run.xml
index f82abec98a..67c5df3ebc 100644
--- a/.run/Test Profile_ auth-jwt-custody.run.xml	
+++ b/.run/Test Profile_ auth-jwt-custody.run.xml	
@@ -5,7 +5,6 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
-    <option name="REDIRECT_INPUT" value="true" />
     <shortenClasspath name="ARGS_FILE" />
     <extension name="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />

From 1e5f278eb3e77a9be745d94b6287149b5a169a66 Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@stellar.org>
Date: Fri, 22 Nov 2024 13:28:00 -0800
Subject: [PATCH 5/7] Add local profile in docker compose file

---
 Dockerfile                                     |  2 +-
 docker-compose.yaml                            | 13 +++++++++++++
 docs/README.md                                 | 13 +++++++++++++
 .../main/resources/common/docker-compose.yaml  | 18 +++++++-----------
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1cb59c1cf9..0e8a099ee0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=gradle:7.6.4-jdk17-alpine
+ARG BASE_IMAGE=gradle:8.2.1-jdk17-alpine
 
 FROM ${BASE_IMAGE} AS build
 WORKDIR /code
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cd8b210473..7b9a1ede12 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -25,6 +25,19 @@ services:
         To start the services: `docker-compose --profile latest up`
       maintainer: "jamie@stellar.org"
 
+  local-built-servers:
+    extends:
+      file: service-runner/src/main/resources/common/docker-compose.yaml
+      service: dev-servers
+    image: stellar/anchor-platform:local
+    profiles:
+      - 'local'
+    labels:
+      description: |
+        Runs all of the Anchor Platform services from the locally built image.
+        To start the services: `docker-compose --profile local up`
+      maintainer: "jamie@stellar.org"
+
   platform:
     profiles:
       - ''
diff --git a/docs/README.md b/docs/README.md
index 5439f3728b..dcaff8ce1e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -65,6 +65,19 @@ docker compose --profile v2-stable up -d
 docker compose --profile latest up -d
 ```
 
+### For locally built image
+To build the Anchor Platform image locally, run the following command in the root directory of the project.
+```shell
+  # In the root directory of the project
+docker build -t stellar/anchor-platform .
+```
+
+Then, run the following command to start the Anchor Platform.
+```shell
+# In the root directory of the project
+docker compose --profile local up -d
+```
+
 The [Stellar Demo Wallet](https://demo-wallet.stellar.org) can be used to interact with the Anchor Platform. To get
 started, create and fund a new account, then add a new asset with the following parameters.
 
diff --git a/service-runner/src/main/resources/common/docker-compose.yaml b/service-runner/src/main/resources/common/docker-compose.yaml
index 09a496262b..b5d371dc86 100644
--- a/service-runner/src/main/resources/common/docker-compose.yaml
+++ b/service-runner/src/main/resources/common/docker-compose.yaml
@@ -8,11 +8,10 @@ services:
     ports:
       - "8080:8080" # SEP server
       - "8085:8085" # Platform server
-      - "8091:8091" # Reference server
-      - "8092:8092" # Reference server
+      - "8091:8091" # Business Reference server
+      - "8092:8092" # Wallet Reference server
 
   platform:
-    image: anchor-platform:local
     command: --sep-server --platform-server --event-processor
     volumes:
       - ../config:/config
@@ -20,13 +19,7 @@ services:
       - "8080:8080" # SEP server
       - "8085:8085" # Platform server
 
-  sep24-reference-ui:
-    image: stellar/sep24-reference-ui
-    ports:
-      - "3000:80"
-
   observer:
-    image: anchor-platform:local
     build:
       context: ../../../../../essential-tests/src/test
       dockerfile: essential-tests/docker-compose-configs/Dockerfile
@@ -38,14 +31,12 @@ services:
       - "host.docker.internal:host-gateway"
 
   custody-server:
-    image: anchor-platform:local
     command: "--custody-server"
     volumes:
       # add mounts for the new config directory
       - ../config:/config
 
   reference-server:
-    image: anchor-platform:local
     command: "--kotlin-reference-server"
     volumes:
       # add mounts for the new config directory
@@ -55,6 +46,11 @@ services:
     ports:
       - "8091:8091"
 
+  sep24-reference-ui:
+    image: stellar/sep24-reference-ui
+    ports:
+      - "3000:80"
+
   kafka:
     platform: linux
     image: confluentinc/cp-kafka:7.4.3

From 9cc3a9791e494fad376b58db5fcf1a2fa0e782c1 Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@stellar.org>
Date: Fri, 22 Nov 2024 14:37:52 -0800
Subject: [PATCH 6/7] Change base image to gradle-8.2.2-jdk17

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0e8a099ee0..487b847cf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=gradle:8.2.1-jdk17-alpine
+ARG BASE_IMAGE=gradle:8.2.1-jdk17
 
 FROM ${BASE_IMAGE} AS build
 WORKDIR /code

From 827064590aacbda7738d525cb886b7710b29f024 Mon Sep 17 00:00:00 2001
From: Jamie Li <jamie@stellar.org>
Date: Mon, 25 Nov 2024 09:11:40 -0800
Subject: [PATCH 7/7] Fix README.doc by adding local to the docker build label

---
 docs/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index dcaff8ce1e..dfedc8b85a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -68,8 +68,8 @@ docker compose --profile latest up -d
 ### For locally built image
 To build the Anchor Platform image locally, run the following command in the root directory of the project.
 ```shell
-  # In the root directory of the project
-docker build -t stellar/anchor-platform .
+# In the root directory of the project
+docker build -t stellar/anchor-platform:local .
 ```
 
 Then, run the following command to start the Anchor Platform.