From 5dd9a1da4a16bc66349d349de76cc5ca700925e0 Mon Sep 17 00:00:00 2001 From: Nikolay Petrov Date: Fri, 19 Jun 2026 12:47:19 +0300 Subject: [PATCH] feat: harmonize deployment to use dockerfiles and bump to `google-24-full` and `python314` --- Makefile | 3 +++ src/base_eval/naive_and_dummy_forecasters/Makefile | 4 ++-- src/curate_questions/create_question_set/Makefile | 12 ++++++++---- src/curate_questions/publish_question_set/Makefile | 4 ++-- src/helpers/Dockerfile.template | 2 +- src/helpers/Procfile | 1 - src/leaderboard/Makefile | 4 ++-- src/metadata/tag_questions/Makefile | 4 ++-- src/metadata/validate_questions/Makefile | 4 ++-- .../compress_buckets/Dockerfile | 2 +- src/nightly_update_workflow/manager/Makefile | 12 ++++++++---- src/nightly_update_workflow/worker/Makefile | 12 ++++++++---- src/orchestration/func_infer_fetch/Makefile | 4 ++-- src/orchestration/func_infer_update/Makefile | 4 ++-- .../func_llm_forecaster_manager/Makefile | 4 ++-- .../func_llm_forecaster_worker/Makefile | 4 ++-- src/orchestration/func_manifold_fetch/Makefile | 4 ++-- src/orchestration/func_manifold_update/Makefile | 4 ++-- src/orchestration/func_metaculus_fetch/Makefile | 4 ++-- src/orchestration/func_metaculus_update/Makefile | 4 ++-- src/orchestration/func_polymarket_fetch/Makefile | 4 ++-- src/orchestration/func_polymarket_update/Makefile | 4 ++-- src/orchestration/func_resolve/Makefile | 4 ++-- src/orchestration/func_yfinance_fetch/Makefile | 4 ++-- src/orchestration/func_yfinance_update/Makefile | 4 ++-- src/questions/acled/fetch/Makefile | 12 ++++++++---- src/questions/acled/update_questions/Makefile | 12 ++++++++---- src/questions/dbnomics/fetch/Makefile | 12 ++++++++---- src/questions/dbnomics/update_questions/Makefile | 12 ++++++++---- src/questions/fred/fetch/Makefile | 12 ++++++++---- src/questions/fred/update_questions/Makefile | 12 ++++++++---- src/questions/wikipedia/fetch/Makefile | 12 ++++++++---- src/questions/wikipedia/update_questions/Makefile | 12 ++++++++---- 33 files changed, 129 insertions(+), 83 deletions(-) delete mode 100644 src/helpers/Procfile diff --git a/Makefile b/Makefile index c29963fb..03c03503 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,9 @@ export WORKSPACE_BUCKET export CLOUD_DEPLOY_REGION := us-central1 +export RUNTIME_STACK := google-24-full +export PYTHON_RUNTIME := python314 + export LLM_BASELINE_DOCKER_IMAGE_NAME := llm-baselines export LLM_BASELINE_DOCKER_REPO_NAME := llm-baselines export LLM_BASELINE_PUB_SUB_TOPIC_NAME := run-llm-baselines diff --git a/src/base_eval/naive_and_dummy_forecasters/Makefile b/src/base_eval/naive_and_dummy_forecasters/Makefile index 5700ed5c..866b7ca3 100644 --- a/src/base_eval/naive_and_dummy_forecasters/Makefile +++ b/src/base_eval/naive_and_dummy_forecasters/Makefile @@ -12,8 +12,8 @@ UPLOAD_DIR = upload Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/curate_questions/create_question_set/Makefile b/src/curate_questions/create_question_set/Makefile index 6e261d0c..cc0ca38d 100644 --- a/src/curate_questions/create_question_set/Makefile +++ b/src/curate_questions/create_question_set/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/curate_questions/publish_question_set/Makefile b/src/curate_questions/publish_question_set/Makefile index 19a06614..7bd81b66 100644 --- a/src/curate_questions/publish_question_set/Makefile +++ b/src/curate_questions/publish_question_set/Makefile @@ -12,8 +12,8 @@ UPLOAD_DIR = upload Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/helpers/Dockerfile.template b/src/helpers/Dockerfile.template index 8106e2e2..c188b005 100644 --- a/src/helpers/Dockerfile.template +++ b/src/helpers/Dockerfile.template @@ -1,4 +1,4 @@ -FROM REGION-docker.pkg.dev/serverless-runtimes/google-22-full/runtimes/python312 +FROM REGION-docker.pkg.dev/serverless-runtimes/STACK/runtimes/PYTHON_VERSION RUN whoami || echo "whoami not found" diff --git a/src/helpers/Procfile b/src/helpers/Procfile deleted file mode 100644 index 469ae068..00000000 --- a/src/helpers/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: python3 main.py diff --git a/src/leaderboard/Makefile b/src/leaderboard/Makefile index ce34fc5b..21da19c0 100644 --- a/src/leaderboard/Makefile +++ b/src/leaderboard/Makefile @@ -17,8 +17,8 @@ PRELIMINARY_UPLOAD_DIR = upload-leaderboard-preliminary Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile NUM_CPUS = 8 diff --git a/src/metadata/tag_questions/Makefile b/src/metadata/tag_questions/Makefile index fd6621d3..2377380d 100644 --- a/src/metadata/tag_questions/Makefile +++ b/src/metadata/tag_questions/Makefile @@ -13,8 +13,8 @@ UPLOAD_DIR = upload Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/metadata/validate_questions/Makefile b/src/metadata/validate_questions/Makefile index 0a46edc4..8668f360 100644 --- a/src/metadata/validate_questions/Makefile +++ b/src/metadata/validate_questions/Makefile @@ -12,8 +12,8 @@ UPLOAD_DIR = upload Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/nightly_update_workflow/compress_buckets/Dockerfile b/src/nightly_update_workflow/compress_buckets/Dockerfile index b5484c69..e22741ba 100644 --- a/src/nightly_update_workflow/compress_buckets/Dockerfile +++ b/src/nightly_update_workflow/compress_buckets/Dockerfile @@ -1,4 +1,4 @@ -FROM us-central1-docker.pkg.dev/serverless-runtimes/google-22-full/runtimes/python312 +FROM us-central1-docker.pkg.dev/serverless-runtimes/google-24-full/runtimes/python314 RUN whoami || echo "whoami not found" diff --git a/src/nightly_update_workflow/manager/Makefile b/src/nightly_update_workflow/manager/Makefile index a54ecc0d..62dd5b33 100644 --- a/src/nightly_update_workflow/manager/Makefile +++ b/src/nightly_update_workflow/manager/Makefile @@ -6,10 +6,14 @@ all : UPLOAD_DIR = upload -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py requirements.txt Procfile +deploy : main.py requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -35,4 +39,4 @@ deploy : main.py requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) + rm -rf $(UPLOAD_DIR) Dockerfile diff --git a/src/nightly_update_workflow/worker/Makefile b/src/nightly_update_workflow/worker/Makefile index 3eeb4b13..cc3d9608 100644 --- a/src/nightly_update_workflow/worker/Makefile +++ b/src/nightly_update_workflow/worker/Makefile @@ -6,10 +6,14 @@ all : UPLOAD_DIR = upload -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py requirements.txt Procfile +deploy : main.py requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -34,4 +38,4 @@ deploy : main.py requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) + rm -rf $(UPLOAD_DIR) Dockerfile diff --git a/src/orchestration/func_infer_fetch/Makefile b/src/orchestration/func_infer_fetch/Makefile index 7f6eb853..b6f6cb71 100644 --- a/src/orchestration/func_infer_fetch/Makefile +++ b/src/orchestration/func_infer_fetch/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_infer_update/Makefile b/src/orchestration/func_infer_update/Makefile index 30bba0e6..1d833094 100644 --- a/src/orchestration/func_infer_update/Makefile +++ b/src/orchestration/func_infer_update/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_llm_forecaster_manager/Makefile b/src/orchestration/func_llm_forecaster_manager/Makefile index a44323f1..b5c3ef81 100644 --- a/src/orchestration/func_llm_forecaster_manager/Makefile +++ b/src/orchestration/func_llm_forecaster_manager/Makefile @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = llm_forecaster Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_llm_forecaster_worker/Makefile b/src/orchestration/func_llm_forecaster_worker/Makefile index 1ffbfb14..5a2467a9 100644 --- a/src/orchestration/func_llm_forecaster_worker/Makefile +++ b/src/orchestration/func_llm_forecaster_worker/Makefile @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = llm_forecaster Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile NUM_CPUS = 4 diff --git a/src/orchestration/func_manifold_fetch/Makefile b/src/orchestration/func_manifold_fetch/Makefile index 6fdf0b5b..6b4e68a0 100644 --- a/src/orchestration/func_manifold_fetch/Makefile +++ b/src/orchestration/func_manifold_fetch/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_manifold_update/Makefile b/src/orchestration/func_manifold_update/Makefile index 25b82fc3..ba38b15b 100644 --- a/src/orchestration/func_manifold_update/Makefile +++ b/src/orchestration/func_manifold_update/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_metaculus_fetch/Makefile b/src/orchestration/func_metaculus_fetch/Makefile index d00f45f2..f64ad4e4 100644 --- a/src/orchestration/func_metaculus_fetch/Makefile +++ b/src/orchestration/func_metaculus_fetch/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_metaculus_update/Makefile b/src/orchestration/func_metaculus_update/Makefile index 7bc0c29c..dec49839 100644 --- a/src/orchestration/func_metaculus_update/Makefile +++ b/src/orchestration/func_metaculus_update/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_polymarket_fetch/Makefile b/src/orchestration/func_polymarket_fetch/Makefile index 522bbe18..37a0e5ec 100644 --- a/src/orchestration/func_polymarket_fetch/Makefile +++ b/src/orchestration/func_polymarket_fetch/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_polymarket_update/Makefile b/src/orchestration/func_polymarket_update/Makefile index 30ef60ac..81232c86 100644 --- a/src/orchestration/func_polymarket_update/Makefile +++ b/src/orchestration/func_polymarket_update/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_resolve/Makefile b/src/orchestration/func_resolve/Makefile index 1191eccf..f366a41a 100644 --- a/src/orchestration/func_resolve/Makefile +++ b/src/orchestration/func_resolve/Makefile @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = resolve Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile NUM_CPUS = 2 diff --git a/src/orchestration/func_yfinance_fetch/Makefile b/src/orchestration/func_yfinance_fetch/Makefile index a05c8b64..3b251f01 100644 --- a/src/orchestration/func_yfinance_fetch/Makefile +++ b/src/orchestration/func_yfinance_fetch/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/orchestration/func_yfinance_update/Makefile b/src/orchestration/func_yfinance_update/Makefile index a6d17086..2a63c3a5 100644 --- a/src/orchestration/func_yfinance_update/Makefile +++ b/src/orchestration/func_yfinance_update/Makefile @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template sed \ -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ - -e 's/STACK/google-22-full/g' \ - -e 's/PYTHON_VERSION/python312/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ $< > Dockerfile deploy : main.py .gcloudignore requirements.txt Dockerfile diff --git a/src/questions/acled/fetch/Makefile b/src/questions/acled/fetch/Makefile index 626a2e58..e16235e8 100644 --- a/src/questions/acled/fetch/Makefile +++ b/src/questions/acled/fetch/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/acled/update_questions/Makefile b/src/questions/acled/update_questions/Makefile index 8fc9826e..25ada29d 100644 --- a/src/questions/acled/update_questions/Makefile +++ b/src/questions/acled/update_questions/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/dbnomics/fetch/Makefile b/src/questions/dbnomics/fetch/Makefile index eafd5dce..1446894c 100644 --- a/src/questions/dbnomics/fetch/Makefile +++ b/src/questions/dbnomics/fetch/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/dbnomics/update_questions/Makefile b/src/questions/dbnomics/update_questions/Makefile index 25f4a444..ec9085bb 100644 --- a/src/questions/dbnomics/update_questions/Makefile +++ b/src/questions/dbnomics/update_questions/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/fred/fetch/Makefile b/src/questions/fred/fetch/Makefile index 6846faaa..268e78cc 100644 --- a/src/questions/fred/fetch/Makefile +++ b/src/questions/fred/fetch/Makefile @@ -9,12 +9,16 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile NUM_CPUS=2 -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -41,4 +45,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/fred/update_questions/Makefile b/src/questions/fred/update_questions/Makefile index 6b370410..ec1622d6 100644 --- a/src/questions/fred/update_questions/Makefile +++ b/src/questions/fred/update_questions/Makefile @@ -9,12 +9,16 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile NUM_CPUS=2 -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -41,4 +45,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/wikipedia/fetch/Makefile b/src/questions/wikipedia/fetch/Makefile index 191052cb..a826aa14 100644 --- a/src/questions/wikipedia/fetch/Makefile +++ b/src/questions/wikipedia/fetch/Makefile @@ -9,12 +9,16 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile NUM_CPUS = 4 -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -41,4 +45,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile diff --git a/src/questions/wikipedia/update_questions/Makefile b/src/questions/wikipedia/update_questions/Makefile index b718907e..da484ae7 100644 --- a/src/questions/wikipedia/update_questions/Makefile +++ b/src/questions/wikipedia/update_questions/Makefile @@ -9,10 +9,14 @@ UPLOAD_DIR = upload .gcloudignore: cp -r $(ROOT_DIR)src/helpers/.gcloudignore . -Procfile: - cp -r $(ROOT_DIR)src/helpers/Procfile . +Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template + sed \ + -e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \ + -e 's/STACK/$(RUNTIME_STACK)/g' \ + -e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \ + $< > Dockerfile -deploy : main.py .gcloudignore requirements.txt Procfile +deploy : main.py .gcloudignore requirements.txt Dockerfile rm -rf $(UPLOAD_DIR) mkdir -p $(UPLOAD_DIR) cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/ @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile --source $(UPLOAD_DIR) clean : - rm -rf $(UPLOAD_DIR) .gcloudignore Procfile + rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile