瀏覽代碼

init project

rubyangxg 4 年之前
父節點
當前提交
026ee1f509

+ 0 - 170
redis-cluster/docker-compose.yml

@@ -19,9 +19,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis1.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis1:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.41"
 
   redis2:
     <<: *defaults
@@ -29,9 +26,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis2.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis2:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.42"
 
   redis3:
     <<: *defaults
@@ -39,9 +33,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis3.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis3:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.43"
 
   redis4:
     <<: *defaults
@@ -49,9 +40,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis4.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis4:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.44"
     depends_on:
       - redis1
       - redis2
@@ -63,9 +51,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis5.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis5:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.45"
     depends_on:
       - redis1
       - redis2
@@ -77,9 +62,6 @@ services:
     volumes:
       - ./redis-cluster/conf/redis6.conf:/etc/redis.conf:rw
       - ${DATA_PATH}/redis6:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.46"
     depends_on:
       - redis1
       - redis2
@@ -96,9 +78,6 @@ services:
       - "26379"
     volumes:
       - ${DATA_PATH}/redis_cluster_creator:/data:rw
-    networks:
-      nas-network:
-        ipv4_address: "192.168.1.40"
     depends_on:
       - redis1
       - redis2
@@ -107,152 +86,3 @@ services:
       - redis5
       - redis6
 
-networks:
-  nas-network:
-    external: true
-#  redis2:
-#    env_file:
-#      - ../all.env
-#    container_name: redis2
-#    privileged: true
-#    build:
-#      context: redis-cluster
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ./redis-cluster/conf/redis2.conf:/etc/redis.conf:rw
-#      - ${DATA_PATH}/redis2:/data:rw
-#    restart: always
-#    stdin_open: true
-#    tty: true
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.42"
-#
-#  redis3:
-#    env_file:
-#      - ../all.env
-#    container_name: redis3
-#    privileged: true
-#    build:
-#      context: redis-cluster
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ./redis-cluster/conf/redis3.conf:/etc/redis.conf:rw
-#      - ${DATA_PATH}/redis3:/data:rw
-#    restart: always
-#    stdin_open: true
-#    tty: true
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.43"
-#
-#  redis4:
-#    env_file:
-#      - ../all.env
-#    container_name: redis4
-#    privileged: true
-#    build:
-#      context: redis-cluster
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ./redis-cluster/conf/redis4.conf:/etc/redis.conf:rw
-#      - ${DATA_PATH}/redis4:/data:rw
-#    restart: always
-#    stdin_open: true
-#    tty: true
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.44"
-#    depends_on:
-#      - redis1
-#      - redis2
-#      - redis3
-#
-#  redis5:
-#    env_file:
-#      - ../all.env
-#    container_name: redis5
-#    privileged: true
-#    build:
-#      context: redis-cluster
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ./redis-cluster/conf/redis5.conf:/etc/redis.conf:rw
-#      - ${DATA_PATH}/redis5:/data:rw
-#    restart: always
-#    stdin_open: true
-#    tty: true
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.45"
-#    depends_on:
-#      - redis1
-#      - redis2
-#      - redis3
-#
-#  redis6:
-#    env_file:
-#      - ../all.env
-#    container_name: redis6
-#    privileged: true
-#    build:
-#      context: redis-cluster
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ./redis-cluster/conf/redis6.conf:/etc/redis.conf:rw
-#      - ${DATA_PATH}/redis6:/data:rw
-#    restart: always
-#    stdin_open: true
-#    tty: true
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.46"
-#    depends_on:
-#      - redis1
-#      - redis2
-#      - redis3
-#
-#  redis_cluster_creator:
-#    env_file:
-#      - ../all.env
-#    container_name: redis_cluster_creator
-#    privileged: true
-#    build:
-#      context: redis-cluster-creator
-#      args:
-#        REDIS_VERSION: 5.0.3-alpine
-#    ports:
-#      - "6379"
-#      - "26379"
-#    volumes:
-#      - ${DATA_PATH}/redis_cluster_creator:/data:rw
-#    networks:
-#      nas-network:
-#        ipv4_address: "192.168.1.40"
-#    depends_on:
-#      - redis1
-#      - redis2
-#      - redis3
-#      - redis4
-#      - redis5
-#      - redis6

+ 1 - 1
redis-cluster/redis-cluster-creator/Dockerfile

@@ -1,4 +1,4 @@
-FROM nasbase
+FROM mybase
 
 # install nginx
 RUN apk update \

+ 1 - 1
redis-cluster/redis-cluster/Dockerfile

@@ -1,4 +1,4 @@
-FROM nasbase
+FROM mybase
 
 # install nginx
 RUN apk update \