From b1126d622088e6e403ceee693dc01c49b37d854a Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Mon, 8 Jun 2026 12:45:51 -0700 Subject: [PATCH 1/4] tweak --- document-service/doc-api/Dockerfile | 2 ++ document-service/doc-api/update_db.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/document-service/doc-api/Dockerfile b/document-service/doc-api/Dockerfile index 3c4c34d9..1e70b133 100644 --- a/document-service/doc-api/Dockerfile +++ b/document-service/doc-api/Dockerfile @@ -85,6 +85,8 @@ USER web FROM development_build AS production_build COPY --chown=web:web . /code +RUN chmod +x /code/update_db.sh + # ENV PYTHONPATH=/opt/app-root/src # CMD gunicorn --bind 0.0.0.0:${PORT} --config /code/gunicorn_config.py wsgi:app diff --git a/document-service/doc-api/update_db.sh b/document-service/doc-api/update_db.sh index eae5ad29..e658548f 100644 --- a/document-service/doc-api/update_db.sh +++ b/document-service/doc-api/update_db.sh @@ -3,6 +3,8 @@ COMMAND=${1:-upgrade} REVISION=${2:-} echo starting $COMMAND $REVISION export DEPLOYMENT_ENV=migration -export PYTHONPATH="$(pwd)/src:$PYTHONPATH" +export PYTHONPATH=/code/src:$PYTHONPATH +export FLASK_APP=wsgi:app +cd /code flask db $COMMAND $REVISION echo 'upgrade completed' From 5e88f32ad56d7b577cc546661e0af19090088dec Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Mon, 8 Jun 2026 12:55:09 -0700 Subject: [PATCH 2/4] another tweak --- .../doc-api/src/doc_api/__init__.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/document-service/doc-api/src/doc_api/__init__.py b/document-service/doc-api/src/doc_api/__init__.py index e7c4ec1d..525f8d74 100644 --- a/document-service/doc-api/src/doc_api/__init__.py +++ b/document-service/doc-api/src/doc_api/__init__.py @@ -45,7 +45,10 @@ def create_app(service_environment=APP_RUNNING_ENVIRONMENT, **kwargs): db.init_app(app) Migrate(app, db) - if app.config.get("DEPLOYMENT_ENV", "") == "testing": # CI only run upgrade for unit testing. + + deployment_env = app.config.get("DEPLOYMENT_ENV", "") + + if deployment_env == "testing": # CI only run upgrade for unit testing. logger.info("Running migration upgrade.") with app.app_context(): upgrade(directory="migrations", revision="head", sql=False, tag=None) @@ -54,14 +57,16 @@ def create_app(service_environment=APP_RUNNING_ENVIRONMENT, **kwargs): logger.info("Finished migration upgrade.") else: logger.info("Logging, migrate set up.") - auth_service.init_app(app) - storage_service.init_app(app) - meta_endpoint.init_app(app) - ops_endpoint.init_app(app) - v1_endpoint.init_app(app) - queue_service.init_app(app) - - setup_jwt_manager(app, jwt) + + # Skip service initialization for migration jobs + if deployment_env != "migration": + auth_service.init_app(app) + storage_service.init_app(app) + meta_endpoint.init_app(app) + ops_endpoint.init_app(app) + v1_endpoint.init_app(app) + queue_service.init_app(app) + setup_jwt_manager(app, jwt) with app.app_context(): if app.config.get("CLOUDSQL_INSTANCE_CONNECTION_NAME"): # pragma: no cover From 00ce1a6e90bf95f8e8009776efdf8014f5b88b92 Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Mon, 8 Jun 2026 13:42:43 -0700 Subject: [PATCH 3/4] cleanup --- document-service/doc-api/update_db.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/document-service/doc-api/update_db.sh b/document-service/doc-api/update_db.sh index e658548f..3ffb87e5 100644 --- a/document-service/doc-api/update_db.sh +++ b/document-service/doc-api/update_db.sh @@ -3,8 +3,8 @@ COMMAND=${1:-upgrade} REVISION=${2:-} echo starting $COMMAND $REVISION export DEPLOYMENT_ENV=migration -export PYTHONPATH=/code/src:$PYTHONPATH -export FLASK_APP=wsgi:app cd /code +export PYTHONPATH="$(pwd)/src:$PYTHONPATH" +export FLASK_APP=wsgi:app flask db $COMMAND $REVISION echo 'upgrade completed' From 7190295e8829b0b34c8f36d3556726c52dc4ff05 Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Mon, 8 Jun 2026 13:47:06 -0700 Subject: [PATCH 4/4] lint --- document-service/doc-api/src/doc_api/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/document-service/doc-api/src/doc_api/__init__.py b/document-service/doc-api/src/doc_api/__init__.py index 525f8d74..8c7c3926 100644 --- a/document-service/doc-api/src/doc_api/__init__.py +++ b/document-service/doc-api/src/doc_api/__init__.py @@ -45,9 +45,9 @@ def create_app(service_environment=APP_RUNNING_ENVIRONMENT, **kwargs): db.init_app(app) Migrate(app, db) - + deployment_env = app.config.get("DEPLOYMENT_ENV", "") - + if deployment_env == "testing": # CI only run upgrade for unit testing. logger.info("Running migration upgrade.") with app.app_context(): @@ -57,7 +57,7 @@ def create_app(service_environment=APP_RUNNING_ENVIRONMENT, **kwargs): logger.info("Finished migration upgrade.") else: logger.info("Logging, migrate set up.") - + # Skip service initialization for migration jobs if deployment_env != "migration": auth_service.init_app(app)