update docker deployment

Author: BFergerson

e2e/docker-compose.yml

@@ -4,12 +4,6 @@ services:
     container_name: e2e-test
     build:
       context: .
-    depends_on:
-      - spp-platform
-      - skywalking-oap
-    links:
-      - spp-platform
-      - skywalking-oap
     environment:
       - SPP_PLATFORM_HOST=spp-platform
       - SPP_OAP_HOST=skywalking-oap
@@ -21,34 +15,17 @@ services:
     ports:
       - "5450:5450"
       - "5455:5455"
+      - "11800:11800"
       - "12800:12800"
     environment:
       - SPP_LOGGING_LEVEL=trace
-      - SPP_OAP_HOST=skywalking-oap
-    volumes:
-      - ./config/spp-platform.crt:/opt/sourceplusplus/config/spp-platform.crt
-      - ./config/spp-platform.key:/opt/sourceplusplus/config/spp-platform.key
-  skywalking-oap:
-    image: sourceplusplus/spp-oap-server:latest
-    container_name: skywalking-oap
-    hostname: skywalking-oap
-    ports:
-      - "11800:11800"
-    depends_on:
-      - spp-platform
-    links:
-      - spp-platform
-    environment:
-      - SPP_PLATFORM_HOST=spp-platform
-      - SPP_PLATFORM_PORT=5460
-      - SPP_PLATFORM_CERTIFICATE_FILE=/skywalking/spp-platform.crt
       - SW_CORE_GRPC_SSL_ENABLED=true
-      - SW_CORE_GRPC_SSL_KEY_PATH=/skywalking/spp-platform.key
-      - SW_CORE_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/spp-platform.crt
-      - SW_CORE_GRPC_SSL_TRUSTED_CA_PATH=/skywalking/spp-platform.crt
+      - SW_CORE_GRPC_SSL_KEY_PATH=/skywalking/config/spp-platform.key
+      - SW_CORE_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/config/spp-platform.crt
+      - SW_CORE_GRPC_SSL_TRUSTED_CA_PATH=/skywalking/config/spp-platform.crt
       - SW_RECEIVER_GRPC_SSL_ENABLED=true
-      - SW_RECEIVER_GRPC_SSL_KEY_PATH=/skywalking/spp-platform.key
-      - SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/spp-platform.crt
+      - SW_RECEIVER_GRPC_SSL_KEY_PATH=/skywalking/config/spp-platform.key
+      - SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/config/spp-platform.crt
     volumes:
-      - ./config/spp-platform.crt:/skywalking/spp-platform.crt
-      - ./config/spp-platform.key:/skywalking/spp-platform.key
+      - ./config/spp-platform.crt:/skywalking/config/spp-platform.crt
+      - ./config/spp-platform.key:/skywalking/config/spp-platform.key

e2e/spp-probe.yml

@@ -12,8 +12,8 @@ skywalking:
     class_cache_mode: "FILE"
     service_name: "spp"
   collector:
-    backend_service: "skywalking-oap:11800"
+    backend_service: "spp-platform:11800"
   plugin:
     toolkit:
       log:
-        transmit_formatted: false
+        transmit_formatted: false

sourceplusplus/SourcePlusPlus.py

@@ -63,12 +63,11 @@ def __init__(self, args: dict = None):
             "SPP_SERVICE_NAME", probe_config["skywalking"]["agent"].get("service_name"), "spp"
         )
 
-        skywalking_host = self.get_config_value("SPP_OAP_HOST", "localhost", "localhost")
         skywalking_port = self.get_config_value("SPP_OAP_PORT", 11800, 11800)
         probe_config["skywalking"]["collector"]["backend_service"] = self.get_config_value(
             "SPP_SKYWALKING_BACKEND_SERVICE",
             probe_config["skywalking"]["collector"].get("backend_service"),
-            skywalking_host + ":" + str(skywalking_port)
+            probe_config["spp"]["platform_host"] + ":" + str(skywalking_port)
         )
 
         for key, val in args.items():