Merge branch 'development' of github.com:hotosm/fmtm into fix/offline-bugs

Author: NSUWAL123

compose.yaml

@@ -346,7 +346,6 @@ services:
   fmtm-db:
     # Temp workaround until https://github.com/postgis/docker-postgis/issues/216
     image: "ghcr.io/hotosm/postgis:${POSTGIS_TAG:-14-3.5-alpine}"
-    command: -c 'wal_level=logical'
     volumes:
       - fmtm_db_data:/var/lib/postgresql/data/
     environment:
@@ -358,6 +357,7 @@ services:
     networks:
       - fmtm-net
     restart: "unless-stopped"
+    command: -c 'max_connections=300' -c 'wal_level=logical'
     healthcheck:
       test: pg_isready -U ${FMTM_DB_USER:-fmtm} -d ${FMTM_DB_NAME:-fmtm}
       start_period: 5s
@@ -388,7 +388,6 @@ services:
   central-db:
     profiles: ["", "central"]
     image: "ghcr.io/hotosm/postgis:${POSTGIS_TAG:-14-3.5-alpine}"
-    command: -c 'max_connections=300' -c 'wal_level=logical'
     volumes:
       - central_db_data:/var/lib/postgresql/data/
     environment:
@@ -400,6 +399,8 @@ services:
     networks:
       - fmtm-net
     restart: "unless-stopped"
+    # Not really required during local dev - enable if testing issues
+    # command: -c 'max_connections=300'
     healthcheck:
       test: pg_isready -U ${CENTRAL_DB_USER:-odk} -d ${CENTRAL_DB_NAME:-odk}
       start_period: 5s

deploy/gen-and-deploy.sh

@@ -34,8 +34,8 @@ gen_current_env() {
         done < <(grep -vE '^\s*#|^\s*$' .env)
     fi
 
-    # Generate compose file (note this is currently only for development branch)
-    export GIT_BRANCH=development
+    # Generate compose file (default development, but can be overridden)
+    export GIT_BRANCH="${GIT_BRANCH:-development}"
     echo ""
     echo "Generated compose file:"
     echo ""

src/backend/app-entrypoint.sh

@@ -8,7 +8,7 @@ wait_for_db() {
 
     for ((i = 0; i < max_retries; i++)); do
         if </dev/tcp/"${FMTM_DB_HOST:-fmtm-db}"/5432; then
-            echo "Database is available."
+            echo "✓ Database is available."
             return 0  # Database is available, exit successfully
         fi
         echo "Database is not yet available. Retrying in ${retry_interval} seconds..."
@@ -23,6 +23,9 @@ wait_for_s3() {
     max_retries=10
     retry_interval=5
 
+    # First wait a few seconds for Minio
+    sleep 5
+    echo "Testing S3 connection to ${S3_ENDPOINT}"
     for ((i = 0; i < max_retries; i++)); do
         http_status=$(curl --silent --head --write-out "%{http_code}" --output /dev/null "${S3_ENDPOINT}/minio/health/live")
 

src/backend/backup-entrypoint.sh

@@ -65,7 +65,7 @@ wait_for_db() {
 
     for ((i = 0; i < max_retries; i++)); do
         if </dev/tcp/"${db_host}"/5432; then
-            echo "Database is available."
+            echo "✓ Database is available."
             return 0  # Database is available, exit successfully
         fi
         echo "Database is not yet available. Retrying in ${retry_interval} seconds..."
@@ -80,6 +80,9 @@ wait_for_s3() {
     max_retries=10
     retry_interval=5
 
+    # First wait a few seconds for Minio
+    sleep 5
+    echo "Testing S3 connection to ${S3_ENDPOINT}"
     for ((i = 0; i < max_retries; i++)); do
         http_status=$(curl --silent --head --write-out "%{http_code}" --output /dev/null "${S3_ENDPOINT}/minio/health/live")
 

src/backend/migrate-entrypoint.sh

@@ -81,7 +81,7 @@ wait_for_db() {
 
     for ((i = 0; i < max_retries; i++)); do
         if </dev/tcp/"${FMTM_DB_HOST:-fmtm-db}"/5432; then
-            echo "Database is available."
+            echo "✓ Database is available."
             return 0  # Database is available, exit successfully
         fi
         echo "Database is not yet available. Retrying in ${retry_interval} seconds..."
@@ -96,6 +96,9 @@ wait_for_s3() {
     max_retries=10
     retry_interval=5
 
+    # First wait a few seconds for Minio
+    sleep 5
+    echo "Testing S3 connection to ${S3_ENDPOINT}"
     for ((i = 0; i < max_retries; i++)); do
         http_status=$(curl --silent --head --write-out "%{http_code}" --output /dev/null "${S3_ENDPOINT}/minio/health/live")
 

src/backend/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "pydantic-settings==2.6.0",
     "geojson-pydantic==1.1.2",
     "python-multipart==0.0.12",
-    "psycopg[pool]>=3.2.3",
+    "psycopg[pool]==3.2.3",
     "geojson==3.1.0",
     "shapely==2.0.6",
     "pyxform==2.1.1",
@@ -45,14 +45,14 @@ dependencies = [
     "sozipfile==0.3.2",
     "cryptography==43.0.3",
     "pyjwt==2.9.0",
+    "aiosmtplib==4.0.1",
+    "markdown==3.8",
     "osm-fieldwork",
     "osm-login-python==2.0.0",
     "osm-rawdata==0.4.2",
     "fmtm-splitter==2.0.0",
     "pg-nearest-city==0.2.1",
     "pyodk",
-    "aiosmtplib>=4.0.1",
-    "markdown>=3.8",
 ]
 readme = "../../README.md"
 license = {text = "AGPL-3.0-only"}

src/backend/uv.lock

@@ -254,7 +254,7 @@
 										style:height="100%"
 										use:handleIframe
 										title="odk-web-forms-wrapper"
-										src={`./web-forms.html?projectId=${projectId}&entityId=${entityId}&formXml=${formXml}&odkWebFormUrl=${odkWebFormUrl}&formMedia=${encodeURIComponent(JSON.stringify(formMedia))}&cssFile=${commonStore.config?.cssFileWebformsOverride || ''}`}
+										src={`/web-forms.html?projectId=${projectId}&entityId=${entityId}&formXml=${formXml}&odkWebFormUrl=${odkWebFormUrl}&formMedia=${encodeURIComponent(JSON.stringify(formMedia))}&cssFile=${commonStore.config?.cssFileWebformsOverride || ''}`}
 									></iframe>
 								{/if}
 							{/key}