feat: provide redis configuration

IntersectMBO · Jul 1, 2024 · c31cdc2 · c31cdc2
1 parent f7c1902
commit c31cdc2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/build-and-deploy-beta.yml b/.github/workflows/build-and-deploy-beta.yml
@@ -57,6 +57,7 @@ jobs:
       TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
       IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: ${{ inputs.isProposalDiscussionForumEnabled == 'enabled' }}
+      REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml
@@ -57,6 +57,7 @@ jobs:
       TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
       IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: ${{ inputs.isProposalDiscussionForumEnabled == 'enabled' }}
+      REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/build-and-deploy-staging.yml b/.github/workflows/build-and-deploy-staging.yml
@@ -60,6 +60,7 @@ jobs:
       TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
       IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: ${{github.event_name == 'push' && 'false' || inputs.isProposalDiscussionForumEnabled == 'enabled'}}
+      REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/build-and-deploy-test.yml b/.github/workflows/build-and-deploy-test.yml
@@ -60,6 +60,7 @@ jobs:
       TRAEFIK_LE_EMAIL: "[email protected]"
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
       IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: ${{github.event_name == 'push' && 'false' || inputs.isProposalDiscussionForumEnabled == 'enabled'}}
+      REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/scripts/govtool/config.mk b/scripts/govtool/config.mk
@@ -81,6 +81,7 @@ $(target_config_dir)/backend-config.json: $(config_dir)/templates/backend-config
 		-e "s|<DBSYNC_POSTGRES_PASSWORD>|$${DBSYNC_POSTGRES_PASSWORD}|" \
 		-e "s|<SENTRY_DSN>|$${SENTRY_DSN_BACKEND}|" \
 		-e "s|<SENTRY_ENV>|$(env)|" \
+		-e "s|<REDIS_PASSWORD>|$${REDIS_PASSWORD}|" \
 		$< > $@
 
 $(target_config_dir)/%.yml: $(template_config_dir)/%.yml $(target_config_dir)/

diff --git a/scripts/govtool/config/templates/backend-config.json.tpl b/scripts/govtool/config/templates/backend-config.json.tpl
@@ -14,6 +14,9 @@
     "metadatavalidationhost": "http://metadata-validation",
     "metadatavalidationport": "3000",
     "metadatavalidationmaxconcurrentrequests": 10,
-    "redishost": "localhost",
-    "redisport": 6379
+    "redisconfig" : {
+        "host"    : "http://redis",
+        "port"    : 8094,
+        "password": "<REDIS_PASSWORD>"
+    }
 }
diff --git a/scripts/govtool/config/templates/docker-compose.yml.tpl b/scripts/govtool/config/templates/docker-compose.yml.tpl
@@ -228,6 +228,15 @@ services:
       - "traefik.http.routers.to-analytics-dashboard.entrypoints=websecure"
       - "traefik.http.routers.to-analytics-dashboard.tls.certresolver=myresolver"
       - "traefik.http.services.analytics-dashboard.loadbalancer.server.port=3000"
+
+  redis:
+    image: docker.io/bitnami/redis:7.2
+    ports:
+      - '8094:8094'
+    environment:
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+    volumes:
+      - 'redis_data:/bitnami/redis/data'
 
   backend:
     image: <REPO_URL>/backend:${BACKEND_TAG}
@@ -302,3 +311,4 @@ volumes:
   node-db:
   node-ipc:
   loki-data:
+  redis_data: