refactor: reorganize config locations

jsdelivr · Jan 6, 2025 · 99959d9 · 99959d9
1 parent 1e8b65a
commit 99959d9
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,8 @@ jobs:
           node-version: 20.x
       - name: Set up Redis
         run: |
-          docker compose --env-file config/redis/docker.env up -d
+          cp config/redis/.env.redis ./
+          docker compose --env-file .env.redis up -d
       - name: Build
         run: |
           npm ci

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -43,7 +43,8 @@ jobs:
           docker restart $(docker ps -aq)
       - name: Set up Redis
         run: |
-          docker compose --env-file config/redis/docker.env up -d
+          cp config/redis/.env.redis ./
+          docker compose --env-file .env.redis up -d
       - name: Build
         run: |
           npm ci

diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ probes-stats/all-result.csv
 probes-stats/all-result.json
 .eslintcache
 .env
+/.env.redis
diff --git a/config/redis/docker.env → config/redis/.env.redis b/config/redis/docker.env → config/redis/.env.redis
diff --git a/config/redis/README.md b/config/redis/README.md
@@ -12,6 +12,16 @@ swapon /swapfile
 echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
 ```
 
-## Config
+### Docker config
 
-See `docker-compose.yml` in the project root and the config files in this directory.
+Assuming you start in this directory:
+
+```
+cp .env.redis ../../
+```
+
+Set the redis password and return to the project root. Then:
+
+```
+docker compose --env-file .env.redis up -d
+```
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
       - ./config/redis/standalone.conf:/redis-stack.conf
       - ./data/redis/7001:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-standalone-2:
     image: redis/redis-stack-server:7.4.0-v1
     ports:
@@ -16,7 +16,7 @@ services:
       - ./config/redis/standalone.conf:/redis-stack.conf
       - ./data/redis/7002:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-node-01:
     image: redis/redis-stack-server:7.4.0-v1
     command: [ "bash", "/home/runner/mounted/node.sh", "7101" ]
@@ -25,7 +25,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - ./data/redis/7101:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-node-02:
     image: redis/redis-stack-server:7.4.0-v1
     command: [ "bash", "/home/runner/mounted/node.sh", "7102" ]
@@ -34,7 +34,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - ./data/redis/7102:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-node-03:
     image: redis/redis-stack-server:7.4.0-v1
     command: [ "bash", "/home/runner/mounted/node.sh", "7103" ]
@@ -43,7 +43,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - ./data/redis/7103:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-node-04:
     image: redis/redis-stack-server:7.4.0-v1
     command: [ "bash", "/home/runner/mounted/node.sh", "7104" ]
@@ -52,7 +52,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - ./data/redis/7104:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
   redis-cluster-creator:
     image: redis/redis-stack-server:7.4.0-v1
     command: redis-cli -a "$REDIS_PASSWORD" --cluster create $REDIS_PUBLIC_IP:7101 $REDIS_PUBLIC_IP:7102 $REDIS_PUBLIC_IP:7103 $REDIS_PUBLIC_IP:7104 --cluster-replicas 0 --cluster-yes
@@ -63,7 +63,7 @@ services:
       - redis-node-03
       - redis-node-04
     env_file:
-      - ./config/redis/docker.env
+      - ./config/redis/.env.redis
 
   mariadb:
     image: mariadb:10.11.5

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - ./config/redis/standalone.conf:/redis-stack.conf
       - /data/redis/7001:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-standalone-2:
@@ -18,7 +18,7 @@ services:
       - ./config/redis/standalone.conf:/redis-stack.conf
       - /data/redis/7002:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-01:
@@ -29,7 +29,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7101:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-02:
@@ -40,7 +40,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7102:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-03:
@@ -51,7 +51,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7103:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-04:
@@ -62,7 +62,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7104:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-05:
@@ -73,7 +73,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7105:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-06:
@@ -84,7 +84,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7106:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-07:
@@ -95,7 +95,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7107:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-08:
@@ -106,7 +106,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7108:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-09:
@@ -117,7 +117,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7109:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-node-10:
@@ -128,7 +128,7 @@ services:
       - ./config/redis:/home/runner/mounted
       - /data/redis/7110:/data
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis
     restart: unless-stopped
     stop_grace_period: 2m
   redis-cluster-creator:
@@ -147,4 +147,4 @@ services:
       - redis-node-09
       - redis-node-10
     env_file:
-      - ./config/redis/docker.env
+      - ./.env.redis