ci: 修改jenkinsfile

metersphere · Oct 13, 2023 · e2bb296 · e2bb296
1 parent 45c5d34
commit e2bb296
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -268,7 +268,7 @@ pipeline {
                         def images = ['jmeter:${JMETER_TAG}',
                                     'kafka:3.5.1',
                                     'mysql:8.0.34',
-                                    'redis:7.0.12-alpine',
+                                    'redis:7.2.0-alpine',
                                     'minio:RELEASE.2023-08-09T23-30-22Z',
                                     'prometheus:v2.42.0',
                                     'node-chromium:4.10.0',
@@ -293,7 +293,7 @@ pipeline {
                         ${IMAGE_PREFIX}/jmeter:${JMETER_TAG} \\
                         ${IMAGE_PREFIX}/kafka:3.5.1 \\
                         ${IMAGE_PREFIX}/mysql:8.0.34 \\
-                        ${IMAGE_PREFIX}/redis:7.0.12-alpine \\
+                        ${IMAGE_PREFIX}/redis:7.2.0-alpine \\
                         ${IMAGE_PREFIX}/minio:RELEASE.2023-08-09T23-30-22Z \\
                         ${IMAGE_PREFIX}/prometheus:v2.42.0 \\
                         ${IMAGE_PREFIX}/node-firefox:4.10.0 \\

diff --git a/metersphere/docker-compose-mysql.yml b/metersphere/docker-compose-mysql.yml
@@ -11,6 +11,7 @@ services:
     environment:
       MYSQL_DATABASE: ${MS_MYSQL_DB}
       MYSQL_ROOT_PASSWORD: ${MS_MYSQL_PASSWORD}
+      TZ: "Asia/Shanghai"
     ports:
       - ${MS_MYSQL_PORT}:3306
     volumes:

diff --git a/metersphere/docker-compose-prometheus.yml b/metersphere/docker-compose-prometheus.yml
@@ -3,9 +3,11 @@ services:
   prometheus:
     image: ${MS_IMAGE_PREFIX}/prometheus:v2.42.0
     container_name: ms-prometheus
+    environment:
+      TZ: "Asia/Shanghai"
     volumes:
-      - ms-prometheus-conf:/etc/prometheus/
-      - ms-prometheus-data:/prometheus
+        - ms-prometheus-conf:/etc/prometheus/
+        - ms-prometheus-data:/prometheus
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
       - '--storage.tsdb.path=/prometheus'

diff --git a/metersphere/docker-compose-redis.yml b/metersphere/docker-compose-redis.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   redis:
-    image: ${MS_IMAGE_PREFIX}/redis:7.0.12-alpine
+    image: ${MS_IMAGE_PREFIX}/redis:7.2.0-alpine
     container_name: redis
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]