diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 833503d..6530729 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,6 +3,7 @@ name: Deploy on: + workflow_dispatch: push: branches: develop @@ -38,18 +39,18 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events + tags: us-central1-docker.pkg.dev/api-tools-451421/runners/runner - - name: Upload to dev job + - name: Upload to daily dev job uses: google-github-actions/deploy-cloudrun@v2 with: - job: 'daily-update-events-dev' - image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events' + job: 'daily-dev' + image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/runner' region: us-central1 - - name: Upload to prod job + - name: Upload to daily prod job uses: google-github-actions/deploy-cloudrun@v2 with: - job: 'daily-update-events-prod' - image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events' + job: 'daily-prod' + image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/runner' region: us-central1 diff --git a/Dockerfile b/Dockerfile index a4bdc4c..7c907c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ ENV GOOGLE_CHROME_BIN /usr/bin/chromium # Also set this for compatibility # Copy build file from builder COPY --from=builder /app/api-tools /app/api-tools -COPY deploy.sh /app/deploy.sh +COPY runners /app/runners -RUN chmod +x /app/deploy.sh -ENTRYPOINT ["/app/deploy.sh"] +RUN chmod +x /app/runners/setup.sh +ENTRYPOINT ["/app/runners/setup.sh"] diff --git a/runners/daily.sh b/runners/daily.sh new file mode 100644 index 0000000..764ee13 --- /dev/null +++ b/runners/daily.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# for daily tasks to run + +# scrape, parse, and upload events +./api-tools -scrape -mazevo -verbose +./api-tools -parse -mazevo -verbose +./api-tools -scrape -astra -verbose +./api-tools -parse -astra -verbose +./api-tools -upload -events -verbose diff --git a/deploy.sh b/runners/setup.sh similarity index 54% rename from deploy.sh rename to runners/setup.sh index eeffdfa..d239dca 100644 --- a/deploy.sh +++ b/runners/setup.sh @@ -1,16 +1,12 @@ #!/bin/sh -# service account +# auth with service account gcloud secrets versions access latest --secret="$SERVICE_ACCOUNT_SECRET_NAME" > service_account.json gcloud auth activate-service-account --key-file=service_account.json rm service_account.json -# .env +# use service account to access environment variables from GCP secrets, create .env gcloud secrets versions access latest --secret="$ENV_SECRET_NAME" > .env -# Scrape, parse, and upload -./api-tools -scrape -mazevo -verbose -./api-tools -parse -mazevo -verbose -./api-tools -scrape -astra -verbose -./api-tools -parse -astra -verbose -./api-tools -upload -events -verbose +# run commands from the file path specified in the GCP run job's variable +sh "/app/runners/$RUNNER_SCRIPT_NAME"