Merge pull request #8 from openstates/add-entrypoint-script

Add entrypoint

Author: alexobaseki

Dockerfile

@@ -32,5 +32,8 @@ RUN poetry install --no-root \
 
 # Copy application code
 COPY . /app
+# Copy entrypoint script
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
-ENTRYPOINT ["poetry", "run", "python", "main.py"]
+ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -e
+
+# Handle GCP credentials
+if [[ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then
+    echo "Applying app credentials..."
+    echo "${GOOGLE_APPLICATION_CREDENTIALS}" > /creds.json
+    export GOOGLE_APPLICATION_CREDENTIALS="/creds.json"
+elif [[ -n "${GOOGLE_CREDENTIAL_FILE}" ]]; then
+    echo "Assuming a valid credentials file is mounted at ${GOOGLE_CREDENTIAL_FILE}..."
+    export GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_CREDENTIAL_FILE}
+fi
+
+# Run the main app
+exec poetry run python main.py "$@"

utils.py

@@ -90,7 +90,7 @@ def init_duckdb(
         relative_path = jurisdiction.replace("ocd-jurisdiction/", "")
         sub_directory = f"**/{relative_path}/{DAG_RUN_START}"
     else:
-        sub_directory = "**"
+        sub_directory = "*/**"
 
     # Create DuckDB and load
     logger.info("Creating DuckDB schema and loading data...")
@@ -107,7 +107,9 @@ def init_duckdb(
             "No file found in local directory, attempting to download from GCS, requires credentials in ENV."
         )
         # Remove "**/" from path prefix before passing to GCS downloader
-        gcs_path = sub_directory[3:] if sub_directory.startswith("**/") else sub_directory
+        gcs_path = (
+            sub_directory[3:] if sub_directory.startswith("**/") else sub_directory
+        )
         download_files_from_gcs(gcs_path)
 
     # Load data into duckdb table