From a2c1a2be445c6a90e84e50c7fa85392fda21c297 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 15 Jul 2024 21:21:36 +0800 Subject: [PATCH] chore: env changed --- metersphere/docker-compose-metersphere.yml | 6 +++--- metersphere/docker-compose-result-hub.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/metersphere/docker-compose-metersphere.yml b/metersphere/docker-compose-metersphere.yml index 7e3b210..48c0049 100644 --- a/metersphere/docker-compose-metersphere.yml +++ b/metersphere/docker-compose-metersphere.yml @@ -16,15 +16,15 @@ services: SPRING_DATASOURCE_URL: jdbc:mysql://${MS_MYSQL_HOST}:${MS_MYSQL_PORT}/${MS_MYSQL_DB}?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&sessionVariables=sql_mode=%27STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION%27 SPRING_DATASOURCE_USERNAME: ${MS_MYSQL_USER} SPRING_DATASOURCE_PASSWORD: ${MS_MYSQL_PASSWORD} - KAFKA_BOOTSTRAP-SERVERS: ${MS_KAFKA_HOST}:${MS_KAFKA_PORT} + KAFKA_BOOTSTRAP_SERVERS: ${MS_KAFKA_HOST}:${MS_KAFKA_PORT} K8S_TASK_RUNNER_IMAGE: ${MS_IMAGE_PREFIX}/task-runner:${MS_IMAGE_TAG} SPRING_SESSION_TIMEOUT: '30d' REDIS_HOST: ${MS_REDIS_HOST} REDIS_PORT: ${MS_REDIS_PORT} REDIS_PASSWORD: ${MS_REDIS_PASSWORD} MINIO_ENDPOINT: ${MS_MINIO_ENDPOINT} - MINIO_ACCESS-KEY: ${MS_MINIO_ACCESS_KEY} - MINIO_SECRET-KEY: ${MS_MINIO_SECRET_KEY} + MINIO_ACCESS_KEY: ${MS_MINIO_ACCESS_KEY} + MINIO_SECRET_KEY: ${MS_MINIO_SECRET_KEY} TOTP_SECRET: ${MS_TOTP_SECRET} ports: - ${MS_SERVER_PORT}:8081 diff --git a/metersphere/docker-compose-result-hub.yml b/metersphere/docker-compose-result-hub.yml index 9526719..e4bf263 100644 --- a/metersphere/docker-compose-result-hub.yml +++ b/metersphere/docker-compose-result-hub.yml @@ -16,13 +16,13 @@ services: SPRING_DATASOURCE_URL: jdbc:mysql://${MS_MYSQL_HOST}:${MS_MYSQL_PORT}/${MS_MYSQL_DB}?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false SPRING_DATASOURCE_USERNAME: ${MS_MYSQL_USER} SPRING_DATASOURCE_PASSWORD: ${MS_MYSQL_PASSWORD} - KAFKA_BOOTSTRAP-SERVERS: ${MS_KAFKA_HOST}:${MS_KAFKA_PORT} + KAFKA_BOOTSTRAP_SERVERS: ${MS_KAFKA_HOST}:${MS_KAFKA_PORT} REDIS_HOST: ${MS_REDIS_HOST} REDIS_PORT: ${MS_REDIS_PORT} REDIS_PASSWORD: ${MS_REDIS_PASSWORD} MINIO_ENDPOINT: ${MS_MINIO_ENDPOINT} - MINIO_ACCESS-KEY: ${MS_MINIO_ACCESS_KEY} - MINIO_SECRET-KEY: ${MS_MINIO_SECRET_KEY} + MINIO_ACCESS_KEY: ${MS_MINIO_ACCESS_KEY} + MINIO_SECRET_KEY: ${MS_MINIO_SECRET_KEY} healthcheck: test: [ "CMD", "bash", "-c", "< /dev/tcp/localhost/8084" ] interval: 6s