From c31cdc2fa8dac2353d33b9e7ec72ce4569ca9733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= Date: Mon, 24 Jun 2024 15:42:28 +0200 Subject: [PATCH] feat: provide redis configuration --- .github/workflows/build-and-deploy-beta.yml | 1 + .github/workflows/build-and-deploy-dev.yml | 1 + .github/workflows/build-and-deploy-staging.yml | 1 + .github/workflows/build-and-deploy-test.yml | 1 + scripts/govtool/config.mk | 1 + .../govtool/config/templates/backend-config.json.tpl | 7 +++++-- .../govtool/config/templates/docker-compose.yml.tpl | 10 ++++++++++ 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy-beta.yml b/.github/workflows/build-and-deploy-beta.yml index 6af69324b..58c6cc095 100644 --- a/.github/workflows/build-and-deploy-beta.yml +++ b/.github/workflows/build-and-deploy-beta.yml @@ -57,6 +57,7 @@ jobs: TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com" 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 index 7755dc10f..8296d896c 100644 --- a/.github/workflows/build-and-deploy-dev.yml +++ b/.github/workflows/build-and-deploy-dev.yml @@ -57,6 +57,7 @@ jobs: TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com" 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 index 7534040d3..49d730b65 100644 --- a/.github/workflows/build-and-deploy-staging.yml +++ b/.github/workflows/build-and-deploy-staging.yml @@ -60,6 +60,7 @@ jobs: TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com" 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 index b2c99fd83..a7b146ba7 100644 --- a/.github/workflows/build-and-deploy-test.yml +++ b/.github/workflows/build-and-deploy-test.yml @@ -60,6 +60,7 @@ jobs: TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com" 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 index f7481188d..b3efc2a3c 100644 --- 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}|" \ -e "s||$${SENTRY_DSN_BACKEND}|" \ -e "s||$(env)|" \ + -e "s||$${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 index 8b544ffe2..bda65e26d 100644 --- 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": "" + } } diff --git a/scripts/govtool/config/templates/docker-compose.yml.tpl b/scripts/govtool/config/templates/docker-compose.yml.tpl index 3c56a1064..7ccdc1e65 100644 --- 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: /backend:${BACKEND_TAG} @@ -302,3 +311,4 @@ volumes: node-db: node-ipc: loki-data: + redis_data: \ No newline at end of file