Add SQL-based migration script, with migration dir

docker-compose.deploy.yml

@@ -91,6 +91,7 @@ services:
       - fmtm_tiles:/opt/tiles
     depends_on:
       - fmtm-db
+      - migrations
       - traefik
     env_file:
       - .env
@@ -109,13 +110,12 @@ services:
     image: "ghcr.io/hotosm/fmtm/backend:${API_VERSION}-${GIT_BRANCH}"
     container_name: fmtm_migrations
     depends_on:
-      - api
+      - fmtm-db
     env_file:
       - .env
     networks:
       - fmtm-net
     entrypoint: ["/migrate-entrypoint.sh"]
-    command: ["alembic", "upgrade", "head"]
     restart: "on-failure:3"
 
   ui:

docker-compose.noodk.yml

@@ -58,6 +58,7 @@ services:
       - ./src/backend/app:/opt/app
     depends_on:
       - fmtm-db
+      - migrations
     env_file:
       - .env
     ports:
@@ -71,13 +72,12 @@ services:
     image: "ghcr.io/hotosm/fmtm/backend:${API_VERSION}-${GIT_BRANCH}"
     container_name: fmtm_migrations
     depends_on:
-      - api
+      - fmtm-db
     env_file:
       - .env
     networks:
       - fmtm-net
     entrypoint: ["/migrate-entrypoint.sh"]
-    command: ["alembic", "upgrade", "head"]
     restart: "on-failure:3"
 
   ui:

docker-compose.yml

@@ -64,6 +64,7 @@ services:
       # - ../osm-fieldwork/osm_fieldwork:/home/appuser/.local/lib/python3.10/site-packages/osm_fieldwork
     depends_on:
       - fmtm-db
+      - migrations
       - central-proxy
     env_file:
       - .env
@@ -78,13 +79,12 @@ services:
     image: "ghcr.io/hotosm/fmtm/backend:debug"
     container_name: fmtm_migrations
     depends_on:
-      - api
+      - fmtm-db
     env_file:
       - .env
     networks:
       - fmtm-dev
     entrypoint: ["/migrate-entrypoint.sh"]
-    command: ["alembic", "upgrade", "head"]
     restart: "on-failure:3"
 
   ui:

src/backend/.dockerignore

@@ -10,4 +10,3 @@
 !pyproject.toml
 !pdm.lock
 !migrations
-!alembic.ini

src/backend/Dockerfile

@@ -108,7 +108,6 @@ WORKDIR /opt
 # Add app code
 COPY app/ /opt/app/
 COPY migrations/ /opt/migrations/
-COPY alembic.ini /opt/
 # Add non-root user, permissions
 RUN useradd -r -u 1001 -m -c "hotosm account" -d /home/appuser -s /bin/false appuser \
     && mkdir -p /opt/logs /opt/tiles \
@@ -150,23 +149,24 @@ USER appuser
 FROM runtime as ci
 # Run all ci as root
 USER root
-ENV PATH="/root/.local/bin:$PATH"
-RUN set -ex \
+ARG PYTHON_IMG_TAG
+COPY --from=extract-deps \
+    /opt/python/requirements-ci.txt /opt/python/
+RUN mv /home/appuser/.local/bin/* /usr/local/bin/ \
+    && mv /home/appuser/.local/lib/python${PYTHON_IMG_TAG}/site-packages/* \
+    /usr/local/lib/python${PYTHON_IMG_TAG}/site-packages/ \
+    && set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install \
     -y --no-install-recommends \
-        "gosu" \
         "git" \
-    && rm -rf /var/lib/apt/lists/*
-RUN mv /home/appuser/.local /root/.local
-COPY --from=extract-deps \
-    /opt/python/requirements-ci.txt /opt/python/
-RUN pip install --user --upgrade --no-warn-script-location \
+    && rm -rf /var/lib/apt/lists/* \
+    && pip install --upgrade --no-warn-script-location \
     --no-cache-dir -r \
     /opt/python/requirements-ci.txt \
-    && rm -r /opt/python
-# Pre-compile packages to .pyc (init speed gains)
-RUN python -c "import compileall; compileall.compile_path(maxlevels=10, quiet=1)"
+    && rm -r /opt/python \
+    # Pre-compile packages to .pyc (init speed gains)
+    && python -c "import compileall; compileall.compile_path(maxlevels=10, quiet=1)"
 # Override entrypoint, as not possible in Github action
 ENTRYPOINT [""]
 CMD [""]

src/backend/app-entrypoint.sh

@@ -2,9 +2,22 @@
 
 set -eo pipefail
 
-while !</dev/tcp/${FMTM_DB_HOST:-fmtm-db}/5432;
-do
-    sleep 1;
-done;
+wait_for_db() {
+    max_retries=30
+    retry_interval=5
 
+    for ((i = 0; i < max_retries; i++)); do
+        if </dev/tcp/${FMTM_DB_HOST:-fmtm-db}/5432; then
+            echo "Database is available."
+            return 0  # Database is available, exit successfully
+        fi
+        echo "Database is not yet available. Retrying in ${retry_interval} seconds..."
+        sleep ${retry_interval}
+    done
+
+    echo "Timed out waiting for the database to become available."
+    exit 1  # Exit with an error code
+}
+
+wait_for_db
 exec "$@"