Merge pull request #182 from IFRCGo/feat/update-docker-compose

Feat/update docker compose
IFRCGo · Dec 5, 2024 · 4eb0c96 · 4eb0c96
2 parents 9bb3e12 + edbca20
commit 4eb0c96
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/backend b/backend
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -48,6 +48,9 @@ x-server: &base_server_setup
     # Static, Media configs
     DJANGO_STATIC_URL: ${DJANGO_STATIC_URL:-/dj-static/}
     DJANGO_MEDIA_URL: ${DJANGO_MEDIA_URL-/dj-media/}
+    # Misc
+    HCAPTCHA_SECRET: ${HCAPTCHA_SECRET?error}
+    HCAPTCHA_SITEKEY: ${HCAPTCHA_SITEKEY?error}
   volumes:
     - ./geographical_data/:/code/apps/cap_feed/geographical/ifrc-go-admin1-geojson/
     - backend_data:/data/
@@ -98,6 +101,8 @@ services:
       APP_GRAPHQL_API_ENDPOINT: ${FRONTEND_APP_GRAPHQL_API_ENDPOINT?error}
       APP_MAPBOX_ACCESS_TOKEN: ${FRONTEND_APP_MAPBOX_ACCESS_TOKEN?error}
       APP_GRAPHQL_CODEGEN_ENDPOINT: ${FRONTEND_APP_GRAPHQL_CODEGEN_ENDPOINT?error}
+    env_file:
+      - .env
     command: |
       sh -c 'pnpm generate && pnpm build && rm -rf /client-build/* ; cp -r build/* /client-build/'
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,12 +32,16 @@ x-server: &base_server_setup
     # Redis config
     CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379/0}
     CACHE_REDIS_URL: ${CACHE_REDIS_URL:-redis://redis:6379/1}
+    TEST_CACHE_REDIS_URL: ${TEST_CACHE_REDIS_URL:-redis://redis:6379/11}
     # Email config
     EMAIL_HOST: ${EMAIL_HOST:-mailpit}
     EMAIL_PORT: ${EMAIL_PORT:-1025}
     EMAIL_HOST_USER: ${EMAIL_HOST_USER:-mailpit}
     EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD:-mailpit}
     DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL:-alert-hub-dev <[email protected]>}
+    # Misc
+    HCAPTCHA_SECRET: ${HCAPTCHA_SECRET:-0x0000000000000000000000000000000000000000}
+    HCAPTCHA_SITEKEY: ${HCAPTCHA_SITEKEY:-10000000-ffff-ffff-ffff-000000000001}
   volumes:
     - ./backend/:/code
     - backend_data:/data/
+128 −0		apps/cap_feed/management/commands/create_fake_alerts.py
+49 −31		apps/subscription/emails.py
+0 −36		apps/subscription/views.py
+17 −19		apps/user/emails.py
+0 −24		apps/user/templates/email_reset.html
+0 −15		apps/user/templates/email_verification.html
+0 −24		apps/user/templates/new_email_verify.html
+0 −24		apps/user/templates/password_reset.html
+8 −0		main/permalinks.py
+7 −1		main/settings.py
+10 −2		main/urls.py
+67 −0		main/views.py
+ −		static/images/alert-hub.png
+ −		static/images/go-logo-long.png
+ −		static/images/open-in-new-tab.png
+146 −30		templates/emails/base.html
+11 −8		templates/emails/base.txt
+101 −20		templates/emails/subscription/body.html
+15 −0		templates/emails/subscription/body.txt
+0 −4		templates/emails/user/password_changed/body.html
+0 −1		templates/emails/user/password_changed/body.txt
+27 −36		templates/emails/user/password_reset/body.html
+0 −1		templates/emails/user/password_reset/body.txt