Merge branch 'release/v0.3.1' into hai/apollo-config-v2

okx · Jul 9, 2024 · b85166a · b85166a
2 parents 604d15a + 17ef00f
commit b85166a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 67 deletions.
diff --git a/coinmiddleware/root-ca-cert b/coinmiddleware/root-ca-cert
diff --git a/config/config.debug.toml b/config/config.debug.toml
@@ -74,7 +74,6 @@ ConsumerGroupID = "xlayer-bridge-service"
 InitialOffset = -1
 Username = ""
 Password = ""
-RootCAPath = "/app/root-ca-cert"
 
 [MessagePushProducer]
 Enabled = false

diff --git a/config/config.local.toml b/config/config.local.toml
@@ -75,7 +75,6 @@ ConsumerGroupID = "xlayer-bridge-service"
 InitialOffset = -1
 Username = ""
 Password = ""
-RootCAPath = "/app/root-ca-cert"
 
 [MessagePushProducer]
 Enabled = false

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -115,7 +115,6 @@ services:
       - ./test/test.keystore.claimtx:/pk/keystore.claimtxmanager
       - ./config/config.local.toml:/app/config.toml
       - ./sentinel/config.json:/app/sentinel_config.json
-      - ./coinmiddleware/root-ca-cert:/app/root-ca-cert
     command:
       - "/bin/sh"
       - "-c"
@@ -135,7 +134,6 @@ services:
     volumes:
       - ./test/test.keystore.claimtx:/pk/keystore.claimtxmanager
       - ./config/config.local.toml:/app/config.toml
-      - ./coinmiddleware/root-ca-cert:/app/root-ca-cert
     command:
       - "/bin/sh"
       - "-c"
@@ -155,7 +153,6 @@ services:
     volumes:
       - ./test/test.keystore.claimtx:/pk/keystore.claimtxmanager
       - ./config/config.local.toml:/app/config.toml
-      - ./coinmiddleware/root-ca-cert:/app/root-ca-cert
     command:
       - "/bin/sh"
       - "-c"
@@ -312,7 +309,6 @@ services:
       - ./test/test.keystore.claimtx:/pk/keystore.claimtxmanager
       - ./config/config.local.toml:/app/config.toml
       - ./sentinel/config.json:/app/sentinel_config.json
-      - ./coinmiddleware/root-ca-cert:/app/root-ca-cert
     command:
       - "/bin/sh"
       - "-c"
@@ -340,7 +336,6 @@ services:
       - ./test/test.keystore.claimtx:/pk/keystore.claimtxmanager
       - ./config/config.local.toml:/app/config.toml
       - ./sentinel/config.json:/app/sentinel_config.json
-      - ./coinmiddleware/root-ca-cert:/app/root-ca-cert
     command:
       - "/bin/sh"
       - "-c"

diff --git a/test/config/node/root-ca-cert b/test/config/node/root-ca-cert