From 2e6a982af5912f41e367ef52b706a1b1490fe87d Mon Sep 17 00:00:00 2001 From: lingniu Date: Wed, 1 Jul 2026 16:13:24 +0800 Subject: [PATCH] chore: decouple portainer consumer startup --- deploy/portainer/docker-compose.yml | 6 ------ .../PortainerComposeResourceLimitsTest.java | 13 ++++++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/deploy/portainer/docker-compose.yml b/deploy/portainer/docker-compose.yml index 3a6eb807..13c1fd6e 100644 --- a/deploy/portainer/docker-compose.yml +++ b/deploy/portainer/docker-compose.yml @@ -147,10 +147,6 @@ services: container_name: vehicle-history-app restart: unless-stopped mem_limit: ${VEHICLE_HISTORY_MEM_LIMIT:-1536m} - depends_on: - - gb32960-ingest-app - - jt808-ingest-app - - yutong-mqtt-app environment: <<: *common-env HTTP_PORT: 20200 @@ -186,8 +182,6 @@ services: container_name: vehicle-analytics-app restart: unless-stopped mem_limit: ${VEHICLE_ANALYTICS_MEM_LIMIT:-1024m} - depends_on: - - jt808-ingest-app environment: <<: *common-env HTTP_PORT: 20300 diff --git a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java index 354459a3..e6770e18 100644 --- a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java +++ b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java @@ -601,13 +601,20 @@ class PortainerComposeResourceLimitsTest { } @Test - void vehicleAnalyticsComposeDependsOnlyOnJt808Ingest() throws IOException { + void kafkaConsumerAppsDoNotDependOnProtocolIngestContainers() throws IOException { String compose = Files.readString(repositoryRoot().resolve("deploy/portainer/docker-compose.yml")); + String historyService = serviceBlock(compose, "vehicle-history-app"); String analyticsService = serviceBlock(compose, "vehicle-analytics-app"); - assertThat(analyticsService) - .contains(" depends_on:\n - jt808-ingest-app") + assertThat(historyService) + .doesNotContain(" depends_on:") .doesNotContain("- gb32960-ingest-app") + .doesNotContain("- jt808-ingest-app") + .doesNotContain("- yutong-mqtt-app"); + assertThat(analyticsService) + .doesNotContain(" depends_on:") + .doesNotContain("- gb32960-ingest-app") + .doesNotContain("- jt808-ingest-app") .doesNotContain("- yutong-mqtt-app"); }