liuyuqi-dellpc 8 months ago
parent
commit
eb07c9331d

+ 0 - 38
docker/db/redis/docker-compose.debug.yml

@@ -1,38 +0,0 @@
-version: '3.4'
-
-services:
-
-  redis:
-    image: redis:7.2.3
-    container_name: infisical-dev-redis
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - 6379:6379
-    volumes:
-      - redis_data:/data
-    networks:
-      - infisical-dev
-    # command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '30m'
-        max-file: '1'
-        
-  redis-commander:
-    container_name: infisical-dev-redis-commander
-    image: rediscommander/redis-commander:latest
-    restart: always
-    depends_on:
-      - redis
-    environment:
-      - REDIS_HOSTS=local:redis:6379
-    ports:
-      - "8085:8081"
-    networks:
-      - infisical-dev
-
-networks:
-  infisical-dev:
-    driver: bridge

+ 0 - 73
docker/db/redis/redis.conf

@@ -1,73 +0,0 @@
-bind 127.0.0.1 -::1
-protected-mode yes
-port 6379
-tcp-backlog 511
-timeout 0
-tcp-keepalive 300
-daemonize no
-pidfile /var/run/redis_6379.pid
-loglevel notice
-logfile ""
-databases 16
-always-show-logo no
-set-proc-title yes
-proc-title-template "{title} {listen-addr} {server-mode}"
-save 20 3
-stop-writes-on-bgsave-error yes
-rdbcompression yes
-rdbchecksum yes
-dbfilename dump.rdb
-rdb-del-sync-files no
-dir ./
-replica-serve-stale-data yes
-replica-read-only yes
-repl-diskless-sync yes
-repl-diskless-sync-delay 5
-repl-diskless-sync-max-replicas 0
-repl-diskless-load disabled
-repl-disable-tcp-nodelay no
-replica-priority 100
-acllog-max-len 128
-lazyfree-lazy-eviction no
-lazyfree-lazy-expire no
-lazyfree-lazy-server-del no
-replica-lazy-flush no
-lazyfree-lazy-user-del no
-lazyfree-lazy-user-flush no
-oom-score-adj no
-oom-score-adj-values 0 200 800
-disable-thp yes
-appendonly no
-appendfilename "appendonly.aof"
-appenddirname "appendonlydir"
-appendfsync everysec
-no-appendfsync-on-rewrite no
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-aof-load-truncated yes
-aof-use-rdb-preamble yes
-aof-timestamp-enabled no
- 
-slowlog-log-slower-than 10000
-slowlog-max-len 128
-latency-monitor-threshold 0
-notify-keyspace-events ""
-hash-max-listpack-entries 512
-hash-max-listpack-value 64
-list-max-listpack-size -2
-list-compress-depth 0
-set-max-intset-entries 512
-zset-max-listpack-entries 128
-zset-max-listpack-value 64
-hll-sparse-max-bytes 3000
-stream-node-max-bytes 4096
-stream-node-max-entries 100
-activerehashing yes
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit replica 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-hz 10
-dynamic-hz yes
-aof-rewrite-incremental-fsync yes
-rdb-save-incremental-fsync yes
-jemalloc-bg-thread yes

+ 31 - 10
php/deploy/docker-compose.debug.yml

@@ -18,16 +18,16 @@ services:
     depends_on:
       - mysql
       - redis
-  
+
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:5.2.1-fpm-alpine
     ports:
-        - '8080:80'
+      - '8080:80'
     restart: always
     environment:
-        PMA_HOST: mysql
+      PMA_HOST: mysql
     depends_on:
-        - mysql
+      - mysql
 
   mysql:
     container_name: mysql-container
@@ -44,22 +44,43 @@ services:
       - 3306:3306
     networks:
       - app-network
-  
+
   redis:
-    container_name: redis-container
     image: redis:7.2.3
+    container_name: redis-container
     restart: unless-stopped
-    volumes:
-      - ./redis:/data
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     ports:
       - 6379:6379
+    volumes:
+      - ./redis:/data
     networks:
       - app-network
-  
+    # command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '30m'
+        max-file: '1'
+
+  redis-commander:
+    container_name: infisical-dev-redis-commander
+    image: rediscommander/redis-commander:latest
+    restart: always
+    depends_on:
+      - redis
+    environment:
+      - REDIS_HOSTS=local:redis:6379
+    ports:
+      - "8085:8081"
+    networks:
+      - infisical-dev
+
   volumes:
     mysql:
     redis:
-  
+
   networks:
     app-network:
       driver: bridge

+ 61 - 16
php/deploy/redis/redis.conf

@@ -1,28 +1,73 @@
-daemonize no
-pidfile /var/run/redis.pid
+bind 127.0.0.1 -::1
+protected-mode yes
 port 6379
-protected-mode no
+tcp-backlog 511
 timeout 0
-loglevel verbose
+tcp-keepalive 300
+daemonize no
+pidfile /var/run/redis_6379.pid
+loglevel notice
+logfile ""
 databases 16
-save 900 1
-save 300 10
-save 60 10000
+always-show-logo no
+set-proc-title yes
+proc-title-template "{title} {listen-addr} {server-mode}"
+save 20 3
+stop-writes-on-bgsave-error yes
 rdbcompression yes
+rdbchecksum yes
 dbfilename dump.rdb
+rdb-del-sync-files no
 dir ./
-slave-serve-stale-data yes
-requirepass 123456
-appendonly yes
+replica-serve-stale-data yes
+replica-read-only yes
+repl-diskless-sync yes
+repl-diskless-sync-delay 5
+repl-diskless-sync-max-replicas 0
+repl-diskless-load disabled
+repl-disable-tcp-nodelay no
+replica-priority 100
+acllog-max-len 128
+lazyfree-lazy-eviction no
+lazyfree-lazy-expire no
+lazyfree-lazy-server-del no
+replica-lazy-flush no
+lazyfree-lazy-user-del no
+lazyfree-lazy-user-flush no
+oom-score-adj no
+oom-score-adj-values 0 200 800
+disable-thp yes
+appendonly no
+appendfilename "appendonly.aof"
+appenddirname "appendonlydir"
 appendfsync everysec
 no-appendfsync-on-rewrite no
 auto-aof-rewrite-percentage 100
 auto-aof-rewrite-min-size 64mb
+aof-load-truncated yes
+aof-use-rdb-preamble yes
+aof-timestamp-enabled no
+ 
 slowlog-log-slower-than 10000
-slowlog-max-len 1024
-list-max-ziplist-entries 512
-list-max-ziplist-value 64
+slowlog-max-len 128
+latency-monitor-threshold 0
+notify-keyspace-events ""
+hash-max-listpack-entries 512
+hash-max-listpack-value 64
+list-max-listpack-size -2
+list-compress-depth 0
 set-max-intset-entries 512
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-activerehashing yes
+zset-max-listpack-entries 128
+zset-max-listpack-value 64
+hll-sparse-max-bytes 3000
+stream-node-max-bytes 4096
+stream-node-max-entries 100
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit replica 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+hz 10
+dynamic-hz yes
+aof-rewrite-incremental-fsync yes
+rdb-save-incremental-fsync yes
+jemalloc-bg-thread yes

+ 0 - 0
python/deploy/redis.conf