Merge pull request #72 from unicef/bugfix/241787-setup-default-variables-in-docker

AB#241787: Setup default variables in docker

Author: domdinicola

docker/Dockerfile

@@ -131,7 +131,9 @@ ENV PATH=/venv/bin:/usr/local/bin/:/usr/bin:/bin \
     PGSSLCERT="/tmp/postgresql.crt" \
     UV_PROJECT_ENVIRONMENT=/venv \
     VIRTUAL_ENV=/venv \
-    UWSGI_PROCESSES=4
+    UWSGI_PROCESSES=4 \
+    MEDIA_ROOT="${MEDIA_ROOT:-/var/run/app/media}" \
+    STATIC_ROOT="${STATIC_ROOT:-/var/run/app/static}"
 
 RUN <<EOF cat> /RELEASE
 {"version": "$VERSION",

docker/bin/docker-entrypoint.sh

@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
 
-export MEDIA_ROOT="${MEDIA_ROOT:-/var/run/app/media}"
-export STATIC_ROOT="${STATIC_ROOT:-/var/run/app/static}"
 export UWSGI_PROCESSES="${UWSGI_PROCESSES:-"4"}"
 export DJANGO_SETTINGS_MODULE="country_workspace.config.settings"
 mkdir -p "${MEDIA_ROOT}" "${STATIC_ROOT}" || echo "Cannot create dirs ${MEDIA_ROOT} ${STATIC_ROOT}"

tests/contrib/aurora/test_aurora_client.py

@@ -4,6 +4,7 @@
 import pytest
 import requests
 import responses
+from constance.test import override_config
 
 from country_workspace.contrib.aurora.client import AuroraClient
 from country_workspace.exceptions import RemoteError
@@ -23,14 +24,15 @@
         ("json_decode", 200, "invalid json", lambda url: f"Wrong JSON response fetching {url}"),
     ],
 )
+@override_config(AURORA_API_URL="https://hope-dummy.org/api/rest", AURORA_API_TOKEN="dummy_token")
 def test_client_exceptions(
     mocked_responses: responses.RequestsMock,
     error_case: str,
     status_code: int,
     body: dict | str,
     expected_error: Callable[[str], str],
 ) -> None:
-    client = AuroraClient(token="dummy")
+    client = AuroraClient()
     path = "dummy_path"
     url = client._get_url(path)
 

tests/contrib/hope/test_hope_client.py

@@ -1,4 +1,3 @@
-# tests/test_hope_client.py
 import re
 from collections.abc import Callable
 from unittest.mock import Mock